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

elinor-fung · web-flow · commit ff381b78a22e · 2025-09-03T13:17:18.000-07:00
diff --git a/src/coreclr/tools/Common/InstructionSetHelpers.cs b/src/coreclr/tools/Common/InstructionSetHelpers.cs
@@ -105,7 +105,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
`@@ -105,7 +105,7 @@ public static InstructionSetSupport ConfigureInstructionSetSupport(string instru`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`string jitInterfaceLibrary = "jitinterface_" + RuntimeInformation.ProcessArchitecture.ToString().ToLowerInvariant();`
`108`		`- nint libHandle = NativeLibrary.Load(jitInterfaceLibrary, System.Reflection.Assembly.GetExecutingAssembly(), DllImportSearchPath.ApplicationDirectory);`
	`108`	`+ nint libHandle = NativeLibrary.Load(jitInterfaceLibrary, System.Reflection.Assembly.GetExecutingAssembly(), DllImportSearchPath.AssemblyDirectory);`
`109`	`109`	`int cpuFeatures;`
`110`	`110`	`unsafe`
`111`	`111`	`{`