[release/7.0] Fix ALC lookup from the DAC (#78420)

* Fix ALC lookup from the DAC It seems the SOS commands for ALC lookup have been broken for a bit. Some parts of the impl weren't DAC-ized and caused failures. * Update src/coreclr/vm/peassembly.cpp Co-authored-by: Aaron Robinson <arobins@microsoft.com>
dotnet · Jan 4, 2023 · 5992707 · 5992707
1 parent aa8eb01
commit 5992707
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/src/coreclr/binder/inc/assembly.hpp b/src/coreclr/binder/inc/assembly.hpp
@@ -26,6 +26,7 @@
 #endif // !defined(DACCESS_COMPILE)
 
 #include "bundle.h"
+#include <assemblybinderutil.h>
 
 class DomainAssembly;
 
@@ -50,7 +51,7 @@ namespace BINDER_SPACE
         PEImage* GetPEImage();
         BOOL GetIsInTPA();
 
-        inline AssemblyBinder* GetBinder()
+        PTR_AssemblyBinder GetBinder()
         {
             return m_pBinder;
         }
@@ -70,21 +71,21 @@ namespace BINDER_SPACE
         LONG                     m_cRef;
         PEImage                 *m_pPEImage;
         AssemblyName            *m_pAssemblyName;
-        AssemblyBinder          *m_pBinder;
+        PTR_AssemblyBinder       m_pBinder;
         bool                     m_isInTPA;
         DomainAssembly          *m_domainAssembly;
 
+#if !defined(DACCESS_COMPILE)
         inline void SetBinder(AssemblyBinder *pBinder)
         {
             _ASSERTE(m_pBinder == NULL || m_pBinder == pBinder);
             m_pBinder = pBinder;
         }
 
-        friend class ::DefaultAssemblyBinder;
-
-#if !defined(DACCESS_COMPILE)
         friend class ::CustomAssemblyBinder;
 #endif // !defined(DACCESS_COMPILE)
+
+        friend class ::DefaultAssemblyBinder;
     };
 
 #include "assembly.inl"

diff --git a/src/coreclr/vm/peassembly.cpp b/src/coreclr/vm/peassembly.cpp
@@ -19,8 +19,6 @@
 #include "strongnameinternal.h"
 
 #include "../binder/inc/applicationcontext.hpp"
-
-#include "assemblybinderutil.h"
 #include "../binder/inc/assemblybindercommon.hpp"
 
 #include "sha1.h"
@@ -1114,10 +1112,10 @@ PTR_AssemblyBinder PEAssembly::GetAssemblyBinder()
 
     PTR_AssemblyBinder pBinder = NULL;
 
-    BINDER_SPACE::Assembly* pHostAssembly = GetHostAssembly();
+    PTR_BINDER_SPACE_Assembly pHostAssembly = GetHostAssembly();
     if (pHostAssembly)
     {
-        pBinder = dac_cast<PTR_AssemblyBinder>(pHostAssembly->GetBinder());
+        pBinder = pHostAssembly->GetBinder();
     }
     else
     {