Skip to content

Remove unused nativeImagePath from assembly LoadFromPath paths #129597

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
elinor-fung merged 1 commit into from
Jun 19, 2026
Merged

Remove unused nativeImagePath from assembly LoadFromPath paths #129597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/coreclr/System.Private.CoreLib/src/System/Runtime/Loader/AssemblyLoadContext.CoreCLR.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public partial class AssemblyLoadContext

[RequiresUnreferencedCode("Types and members the loaded assembly depends on might be removed")]
[LibraryImport(RuntimeHelpers.QCall, EntryPoint = "AssemblyNative_LoadFromPath", StringMarshalling = StringMarshalling.Utf16)]
private static partial void LoadFromPath(IntPtr ptrNativeAssemblyBinder, string? ilPath, string? niPath, ObjectHandleOnStack retAssembly);
private static partial void LoadFromPath(IntPtr ptrNativeAssemblyBinder, string? ilPath, ObjectHandleOnStack retAssembly);

internal static Assembly[] GetLoadedAssemblies()
{
Expand Down Expand Up @@ -61,10 +61,10 @@ internal static Assembly[] GetLoadedAssemblies()
internal static partial bool TraceSatelliteSubdirectoryPathProbed(string filePath, int hResult);

[RequiresUnreferencedCode("Types and members the loaded assembly depends on might be removed")]
private RuntimeAssembly InternalLoadFromPath(string? assemblyPath, string? nativeImagePath)
private RuntimeAssembly InternalLoadFromPath(string? assemblyPath)
{
RuntimeAssembly? loadedAssembly = null;
LoadFromPath(_nativeAssemblyLoadContext, assemblyPath, nativeImagePath, ObjectHandleOnStack.Create(ref loadedAssembly));
LoadFromPath(_nativeAssemblyLoadContext, assemblyPath, ObjectHandleOnStack.Create(ref loadedAssembly));
return loadedAssembly!;
}

Expand Down
2 changes: 1 addition & 1 deletion ...tiveaot/System.Private.CoreLib/src/System/Runtime/Loader/AssemblyLoadContext.NativeAot.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public void StartProfileOptimization(string profile)
{
}

private static Assembly InternalLoadFromPath(string? assemblyPath, string? nativeImagePath)
private static Assembly InternalLoadFromPath(string? assemblyPath)
{
ArgumentNullException.ThrowIfNull(assemblyPath);

Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/vm/assemblynative.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ Assembly* AssemblyNative::LoadFromPEImage(AssemblyBinder* pBinder, PEImage *pIma
RETURN pCurDomain->LoadAssembly(&spec, pPEAssembly, FILE_LOADED);
}

extern "C" void QCALLTYPE AssemblyNative_LoadFromPath(INT_PTR ptrNativeAssemblyBinder, LPCWSTR pwzILPath, LPCWSTR pwzNIPath, QCall::ObjectHandleOnStack retLoadedAssembly)
extern "C" void QCALLTYPE AssemblyNative_LoadFromPath(INT_PTR ptrNativeAssemblyBinder, LPCWSTR pwzILPath, QCall::ObjectHandleOnStack retLoadedAssembly)
{
QCALL_CONTRACT;

Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/vm/assemblynative.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ extern "C" void QCALLTYPE AssemblyNative_PrepareForAssemblyLoadContextRelease(IN

extern "C" void QCALLTYPE AssemblyNative_InternalLoad(NativeAssemblyNameParts* pAssemblyName, QCall::ObjectHandleOnStack requestingAssembly, QCall::StackCrawlMarkHandle stackMark,BOOL fThrowOnFileNotFound, QCall::ObjectHandleOnStack assemblyLoadContext, QCall::ObjectHandleOnStack retAssembly);

extern "C" void QCALLTYPE AssemblyNative_LoadFromPath(INT_PTR ptrNativeAssemblyBinder, LPCWSTR pwzILPath, LPCWSTR pwzNIPath, QCall::ObjectHandleOnStack retLoadedAssembly);
extern "C" void QCALLTYPE AssemblyNative_LoadFromPath(INT_PTR ptrNativeAssemblyBinder, LPCWSTR pwzILPath, QCall::ObjectHandleOnStack retLoadedAssembly);

extern "C" void QCALLTYPE AssemblyNative_LoadFromStream(INT_PTR ptrNativeAssemblyBinder, INT_PTR ptrAssemblyArray, INT32 cbAssemblyArrayLength, INT_PTR ptrSymbolArray, INT32 cbSymbolArrayLength, QCall::ObjectHandleOnStack retLoadedAssembly);
#ifdef TARGET_WINDOWS
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.Private.CoreLib/src/System/Runtime/Loader/AssemblyLoadContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ public Assembly LoadFromAssemblyPath(string assemblyPath)
{
VerifyIsAlive();

return InternalLoadFromPath(assemblyPath, null);
return InternalLoadFromPath(assemblyPath);
}
}

Expand All @@ -368,7 +368,7 @@ public Assembly LoadFromNativeImagePath(string nativeImagePath, string? assembly
{
VerifyIsAlive();

return InternalLoadFromPath(assemblyPath, nativeImagePath);
return InternalLoadFromPath(assemblyPath);
}
Comment thread
elinor-fung marked this conversation as resolved.
}

Expand Down
5 changes: 1 addition & 4 deletions src/mono/System.Private.CoreLib/src/System/Runtime/Loader/AssemblyLoadContext.Mono.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,13 @@ private static void KeepLoaderAllocator()

[RequiresUnreferencedCode("Types and members the loaded assembly depends on might be removed")]
[System.Security.DynamicSecurityMethod] // Methods containing StackCrawlMark local var has to be marked DynamicSecurityMethod
#pragma warning disable IDE0060
private Assembly InternalLoadFromPath(string? assemblyPath, string? nativeImagePath)
private Assembly InternalLoadFromPath(string? assemblyPath)
{
StackCrawlMark stackMark = StackCrawlMark.LookForMyCaller;

assemblyPath = assemblyPath?.Replace('\\', Path.DirectorySeparatorChar);
// TODO: Handle nativeImagePath
return InternalLoadFile(NativeALC, assemblyPath, ref stackMark);
}
#pragma warning restore IDE0060

[RequiresUnreferencedCode("Types and members the loaded assembly depends on might be removed")]
internal Assembly InternalLoad(ReadOnlySpan<byte> arrAssembly, ReadOnlySpan<byte> arrSymbols)
Expand Down
Loading