Change method DestroyContext to PrepareForLoadContextRelease and Rele…

…aseManagedAssemblyLoadContext to ReleaseLoadContext
dotnet · Dec 27, 2016 · 0cc6d4d · 0cc6d4d
1 parent df223c1
commit 0cc6d4d
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 14 deletions.
diff --git a/src/binder/clrprivbinderassemblyloadcontext.cpp b/src/binder/clrprivbinderassemblyloadcontext.cpp
@@ -275,7 +275,7 @@ HRESULT CLRPrivBinderAssemblyLoadContext::SetupContext(DWORD      dwAppDomainId,
     return hr;
 }
 
-void CLRPrivBinderAssemblyLoadContext::DestroyContext(INT_PTR ptrManagedStrongAssemblyLoadContext)
+void CLRPrivBinderAssemblyLoadContext::PrepareForLoadContextRelease(INT_PTR ptrManagedStrongAssemblyLoadContext)
 {
     CONTRACTL
     {
@@ -287,14 +287,15 @@ void CLRPrivBinderAssemblyLoadContext::DestroyContext(INT_PTR ptrManagedStrongAs
     CONTRACTL_END;
 
     // Replace the weak handle with a strong handle
-    // in order to be able to callback Unloading safely
+    // in order to be able to callback the managed method AssemblyLoadContext.Unloading safely
     OBJECTHANDLE handle = reinterpret_cast<OBJECTHANDLE>(m_ptrManagedAssemblyLoadContext);
     OBJECTHANDLE strongHandle = reinterpret_cast<OBJECTHANDLE>(ptrManagedStrongAssemblyLoadContext);
     DestroyShortWeakHandle(handle);
     m_ptrManagedAssemblyLoadContext = reinterpret_cast<INT_PTR>(strongHandle);
 
     // We cannot delete the binder here as it is used indirectly when comparing assemblies with the same binder
-    // It will be deleted by the LoaderAllocator once
+    // It will be deleted when the LoaderAllocator will be deleted
+    // But we can release the LoaderAllocator as we are no longer using it here
     m_pAssemblyLoaderAllocator->Release();
     m_pAssemblyLoaderAllocator = NULL;
 
@@ -308,9 +309,12 @@ CLRPrivBinderAssemblyLoadContext::CLRPrivBinderAssemblyLoadContext()
     m_pTPABinder = NULL;
 }
 
-void CLRPrivBinderAssemblyLoadContext::ReleaseManagedAssemblyLoadContext()
+void CLRPrivBinderAssemblyLoadContext::ReleaseLoadContext()
 {
     VERIFY(m_ptrManagedAssemblyLoadContext != NULL);
+
+    // This method is called to release the strong handle on the managed AssemblyLoadContext
+    // once the Unloading event has been fired
     OBJECTHANDLE handle = reinterpret_cast<OBJECTHANDLE>(m_ptrManagedAssemblyLoadContext);
     DestroyHandle(handle);
     m_ptrManagedAssemblyLoadContext = NULL;

diff --git a/src/binder/inc/clrprivbinderassemblyloadcontext.h b/src/binder/inc/clrprivbinderassemblyloadcontext.h
@@ -89,7 +89,7 @@ class CLRPrivBinderAssemblyLoadContext :
                                 UINT_PTR ptrAssemblyLoadContext,
                                 CLRPrivBinderAssemblyLoadContext **ppBindContext);
 
-    void DestroyContext(INT_PTR ptrManagedStrongAssemblyLoadContext);
+    void PrepareForLoadContextRelease(INT_PTR ptrManagedStrongAssemblyLoadContext);
 
     CLRPrivBinderAssemblyLoadContext();
 
@@ -103,7 +103,7 @@ class CLRPrivBinderAssemblyLoadContext :
         return m_ptrManagedAssemblyLoadContext;
     }
 
-    void ReleaseManagedAssemblyLoadContext();
+    void ReleaseLoadContext();
 
     HRESULT BindUsingPEImage( /* in */ PEImage *pPEImage, 
                               /* in */ BOOL fIsNativeImage, 

diff --git a/src/mscorlib/src/System/Runtime/Loader/AssemblyLoadContext.cs b/src/mscorlib/src/System/Runtime/Loader/AssemblyLoadContext.cs
@@ -48,7 +48,7 @@ public abstract class AssemblyLoadContext
 
         [DllImport(JitHelpers.QCall, CharSet = CharSet.Unicode)]
         [SuppressUnmanagedCodeSecurity]
-        private static extern void DestroyAssemblyLoadContext(IntPtr ptrNativeAssemblyLoadContext, IntPtr ptrAssemblyLoadContextStrong);
+        private static extern void PrepareForAssemblyLoadContextRelease(IntPtr ptrNativeAssemblyLoadContext, IntPtr ptrAssemblyLoadContextStrong);
 
         [DllImport(JitHelpers.QCall, CharSet = CharSet.Unicode)]
         [SuppressUnmanagedCodeSecurity]
@@ -278,7 +278,7 @@ private void UnloadInternal()
 
                 // The underlying code will transform the original weak handle 
                 // created by InitializeLoadContext to a strong handle
-                DestroyAssemblyLoadContext(m_pNativeAssemblyLoadContext, thisStrongHandlePtr);
+                PrepareForAssemblyLoadContextRelease(m_pNativeAssemblyLoadContext, thisStrongHandlePtr);
             }
             else
             {

diff --git a/src/vm/assemblynative.cpp b/src/vm/assemblynative.cpp
@@ -2554,7 +2554,7 @@ INT_PTR QCALLTYPE AssemblyNative::InitializeAssemblyLoadContext(INT_PTR ptrManag
 }
 
 /*static*/
-void QCALLTYPE AssemblyNative::DestroyAssemblyLoadContext(INT_PTR ptrNativeAssemblyLoadContext, INT_PTR ptrManagedStrongAssemblyLoadContext)
+void QCALLTYPE AssemblyNative::PrepareForAssemblyLoadContextRelease(INT_PTR ptrNativeAssemblyLoadContext, INT_PTR ptrManagedStrongAssemblyLoadContext)
 {
     QCALL_CONTRACT;
 
@@ -2565,7 +2565,7 @@ void QCALLTYPE AssemblyNative::DestroyAssemblyLoadContext(INT_PTR ptrNativeAssem
 
     {
         GCX_COOP();
-        reinterpret_cast<CLRPrivBinderAssemblyLoadContext *>(ptrNativeAssemblyLoadContext)->DestroyContext(ptrManagedStrongAssemblyLoadContext);
+        reinterpret_cast<CLRPrivBinderAssemblyLoadContext *>(ptrNativeAssemblyLoadContext)->PrepareForLoadContextRelease(ptrManagedStrongAssemblyLoadContext);
     }
 
     END_QCALL;

diff --git a/src/vm/assemblynative.hpp b/src/vm/assemblynative.hpp
@@ -249,7 +249,7 @@ class AssemblyNative
 #endif
 
     static INT_PTR QCALLTYPE InitializeAssemblyLoadContext(INT_PTR ptrManagedAssemblyLoadContext, BOOL fRepresentsTPALoadContext, BOOL fIsCollectible);
-    static void QCALLTYPE DestroyAssemblyLoadContext(INT_PTR ptrNativeAssemblyLoadContext, INT_PTR ptrManagedStrongAssemblyLoadContext);
+    static void QCALLTYPE PrepareForAssemblyLoadContextRelease(INT_PTR ptrNativeAssemblyLoadContext, INT_PTR ptrManagedStrongAssemblyLoadContext);
     static BOOL QCALLTYPE OverrideDefaultAssemblyLoadContextForCurrentDomain(INT_PTR ptrNativeAssemblyLoadContext);
     static BOOL QCALLTYPE CanUseAppPathAssemblyLoadContextInCurrentDomain();
     static void QCALLTYPE LoadFromPath(INT_PTR ptrNativeAssemblyLoadContext, LPCWSTR pwzILPath, LPCWSTR pwzNIPath, QCall::ObjectHandleOnStack retLoadedAssembly);

diff --git a/src/vm/ecalllist.h b/src/vm/ecalllist.h
@@ -1140,7 +1140,7 @@ FCFuncEnd()
 #if defined(FEATURE_HOST_ASSEMBLY_RESOLVER)
 FCFuncStart(gAssemblyLoadContextFuncs)
     QCFuncElement("InitializeAssemblyLoadContext", AssemblyNative::InitializeAssemblyLoadContext)
-    QCFuncElement("DestroyAssemblyLoadContext", AssemblyNative::DestroyAssemblyLoadContext)
+    QCFuncElement("PrepareForAssemblyLoadContextRelease", AssemblyNative::PrepareForAssemblyLoadContextRelease)
     QCFuncElement("LoadFromPath", AssemblyNative::LoadFromPath)
     QCFuncElement("GetLoadedAssembliesInternal", AssemblyNative::GetLoadedAssembliesInternal)
     QCFuncElement("InternalLoadUnmanagedDllFromPath", AssemblyNative::InternalLoadUnmanagedDllFromPath)

diff --git a/src/vm/loaderallocator.cpp b/src/vm/loaderallocator.cpp
@@ -1749,8 +1749,7 @@ void AssemblyLoaderAllocator::OnUnloading()
     methodOnUnloading.Call(args);
 
     // Release the managed ALC
-
-    m_binderToRelease->ReleaseManagedAssemblyLoadContext();
+    m_binderToRelease->ReleaseLoadContext();
 }
 #endif