Use DllImportSearchPath.AssemblyDirectory for loading jitinterface library (#119333)

github-actions[bot] · elinor-fung · web-flow · commit 81e8e848a82c · 2025-09-03T15:56:51.000-07:00
Co-authored-by: Elinor Fung &lt;elfung@microsoft.com&gt;
diff --git a/src/coreclr/tools/Common/InstructionSetHelpers.cs b/src/coreclr/tools/Common/InstructionSetHelpers.cs
@@ -57,7 +57,7 @@ public static InstructionSetSupport ConfigureInstructionSetSupport(string instru
                 }
 
                 string jitInterfaceLibrary = "jitinterface_" + RuntimeInformation.ProcessArchitecture.ToString().ToLowerInvariant();
-                nint libHandle = NativeLibrary.Load(jitInterfaceLibrary, System.Reflection.Assembly.GetExecutingAssembly(), DllImportSearchPath.ApplicationDirectory);
+                nint libHandle = NativeLibrary.Load(jitInterfaceLibrary, System.Reflection.Assembly.GetExecutingAssembly(), DllImportSearchPath.AssemblyDirectory);
                 int cpuFeatures;
                 unsafe
                 {

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public static InstructionSetSupport ConfigureInstructionSetSupport(string instru`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`string jitInterfaceLibrary = "jitinterface_" + RuntimeInformation.ProcessArchitecture.ToString().ToLowerInvariant();`
`60`		`- nint libHandle = NativeLibrary.Load(jitInterfaceLibrary, System.Reflection.Assembly.GetExecutingAssembly(), DllImportSearchPath.ApplicationDirectory);`
	`60`	`+ nint libHandle = NativeLibrary.Load(jitInterfaceLibrary, System.Reflection.Assembly.GetExecutingAssembly(), DllImportSearchPath.AssemblyDirectory);`
`61`	`61`	`int cpuFeatures;`
`62`	`62`	`unsafe`
`63`	`63`	`{`