Removed GetBinderHash

src/coreclr/binder/applicationcontext.cpp

@@ -29,7 +29,6 @@ namespace BINDER_SPACE
         m_pFailureCache = NULL;
         m_contextCS = NULL;
         m_pTrustedPlatformAssemblyMap = nullptr;
-        m_binderID = 0;
     }
 
     ApplicationContext::~ApplicationContext()
@@ -48,7 +47,7 @@ namespace BINDER_SPACE
         }
     }
 
-    HRESULT ApplicationContext::Init(UINT_PTR binderID)
+    HRESULT ApplicationContext::Init()
     {
         HRESULT hr = S_OK;
 
@@ -76,7 +75,6 @@ namespace BINDER_SPACE
             m_pFailureCache = pFailureCache;
         }
 
-        m_binderID = binderID;
     Exit:
         return hr;
     }

src/coreclr/binder/assembly.cpp

@@ -139,11 +139,6 @@ namespace BINDER_SPACE
         return (pAsmName == nullptr ? nullptr : (LPCWSTR)pAsmName->GetSimpleName());
     }
 
-    UINT_PTR Assembly::GetBinderID()
-    {
-        return m_pBinder ? m_pBinder->GetBinderID() : 0;
-    }
-
     AssemblyLoaderAllocator* Assembly::GetLoaderAllocator()
     {
         return m_pBinder ? m_pBinder->GetLoaderAllocator() : NULL;

src/coreclr/binder/assemblybinder.cpp

@@ -249,7 +249,7 @@ namespace BINDER_SPACE
     // See code:BINDER_SPACE::AssemblyBinder::GetAssembly for info on fNgenExplicitBind
     // and fExplicitBindToNativeImage, and see code:CEECompileInfo::LoadAssemblyByPath
     // for an example of how they're used.
-    HRESULT AssemblyBinder::BindAssembly(/* in */  ApplicationContext  *pApplicationContext,
+    HRESULT AssemblyBinder::BindAssembly(/* in */  ICLRPrivBinder      *pBinder,
                                          /* in */  AssemblyName        *pAssemblyName,
                                          /* in */  LPCWSTR              szCodeBase,
                                          /* in */  PEAssembly          *pParentAssembly,
@@ -261,9 +261,10 @@ namespace BINDER_SPACE
         HRESULT hr = S_OK;
         LONG kContextVersion = 0;
         BindResult bindResult;
+        ApplicationContext* pApplicationContext = pBinder->GetAppContext();
 
         // Tracing happens outside the binder lock to avoid calling into managed code within the lock
-        BinderTracing::ResolutionAttemptedOperation tracer{pAssemblyName, pApplicationContext->GetBinderID(), 0 /*managedALC*/, hr};
+        BinderTracing::ResolutionAttemptedOperation tracer{pAssemblyName, pBinder, 0 /*managedALC*/, hr};
 
 #ifndef CROSSGEN_COMPILE
     Retry:
@@ -1428,7 +1429,7 @@ HRESULT AssemblyBinder::BindUsingHostAssemblyResolver(/* in */ INT_PTR pManagedA
 }
 
 /* static */
-HRESULT AssemblyBinder::BindUsingPEImage(/* in */  ApplicationContext *pApplicationContext,
+HRESULT AssemblyBinder::BindUsingPEImage(/* in */  ICLRPrivBinder* pBinder,
                                          /* in */  BINDER_SPACE::AssemblyName *pAssemblyName,
                                          /* in */  PEImage            *pPEImage,
                                          /* in */  PEKIND              peKind,
@@ -1442,9 +1443,10 @@ HRESULT AssemblyBinder::BindUsingPEImage(/* in */  ApplicationContext *pApplicat
 
     // Prepare binding data
     *ppAssembly = NULL;
+    ApplicationContext* pApplicationContext = pBinder->GetAppContext();
 
     // Tracing happens outside the binder lock to avoid calling into managed code within the lock
-    BinderTracing::ResolutionAttemptedOperation tracer{pAssemblyName, pApplicationContext->GetBinderID(), 0 /*managedALC*/, hr};
+    BinderTracing::ResolutionAttemptedOperation tracer{pAssemblyName, pBinder, 0 /*managedALC*/, hr};
 
     // Attempt the actual bind (eventually more than once)
 Retry:

src/coreclr/binder/bindertracing.cpp

@@ -111,10 +111,11 @@ namespace
 #endif // CROSSGEN_COMPILE
     }
 
-    void GetAssemblyLoadContextNameFromBinderID(UINT_PTR binderID, AppDomain *domain, /*out*/ SString &alcName)
+    void GetAssemblyLoadContextNameFromBindContext(ICLRPrivBinder *bindContext, AppDomain *domain, /*out*/ SString &alcName)
     {
-        ICLRPrivBinder *binder = reinterpret_cast<ICLRPrivBinder *>(binderID);
-        if (binder == domain->GetTPABinderContext())
+        _ASSERTE(bindContext != nullptr);
+
+        if (bindContext == domain->GetTPABinderContext())
         {
             alcName.Set(W("Default"));
         }
@@ -123,21 +124,13 @@ namespace
 #ifdef CROSSGEN_COMPILE
             GetAssemblyLoadContextNameFromManagedALC(0, alcName);
 #else // CROSSGEN_COMPILE
-            CLRPrivBinderAssemblyLoadContext *alcBinder = static_cast<CLRPrivBinderAssemblyLoadContext *>(binder);
+            CLRPrivBinderAssemblyLoadContext* alcBinder = static_cast<CLRPrivBinderAssemblyLoadContext*>(bindContext);
 
             GetAssemblyLoadContextNameFromManagedALC(alcBinder->GetManagedAssemblyLoadContext(), alcName);
 #endif // CROSSGEN_COMPILE
         }
     }
 
-    void GetAssemblyLoadContextNameFromBindContext(ICLRPrivBinder *bindContext, AppDomain *domain, /*out*/ SString &alcName)
-    {
-        _ASSERTE(bindContext != nullptr);
-
-        UINT_PTR binderID = bindContext->GetBinderID();
-        GetAssemblyLoadContextNameFromBinderID(binderID, domain, alcName);
-    }
-
     void GetAssemblyLoadContextNameFromSpec(AssemblySpec *spec, /*out*/ SString &alcName)
     {
         _ASSERTE(spec != nullptr);
@@ -256,14 +249,14 @@ namespace BinderTracing
 
 namespace BinderTracing
 {
-    ResolutionAttemptedOperation::ResolutionAttemptedOperation(AssemblyName *assemblyName, UINT_PTR binderID, INT_PTR managedALC, const HRESULT& hr)
+    ResolutionAttemptedOperation::ResolutionAttemptedOperation(AssemblyName *assemblyName, ICLRPrivBinder* bindContext, INT_PTR managedALC, const HRESULT& hr)
         : m_hr { hr }
         , m_stage { Stage::NotYetStarted }
         , m_tracingEnabled { BinderTracing::IsEnabled() }
         , m_assemblyNameObject { assemblyName }
         , m_pFoundAssembly { nullptr }
     {
-        _ASSERTE(binderID != 0 || managedALC != 0);
+        _ASSERTE(bindContext != nullptr || managedALC != 0);
 
         if (!m_tracingEnabled)
             return;
@@ -279,7 +272,7 @@ namespace BinderTracing
         }
         else
         {
-            GetAssemblyLoadContextNameFromBinderID(binderID, GetAppDomain(), m_assemblyLoadContextName);
+            GetAssemblyLoadContextNameFromBindContext(bindContext, GetAppDomain(), m_assemblyLoadContextName);
         }
     }
 

src/coreclr/binder/clrprivbinderassemblyloadcontext.cpp

@@ -25,7 +25,7 @@ HRESULT CLRPrivBinderAssemblyLoadContext::BindAssemblyByNameWorker(BINDER_SPACE:
 #endif
 
     // Do we have the assembly already loaded in the context of the current binder?
-    hr = AssemblyBinder::BindAssembly(GetAppContext(),
+    hr = AssemblyBinder::BindAssembly(this,
                                       pAssemblyName,
                                       NULL,
                                       NULL,
@@ -150,7 +150,7 @@ HRESULT CLRPrivBinderAssemblyLoadContext::BindUsingPEImage( /* in */ PEImage *pP
             IF_FAIL_GO(HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND));
         }
 
-        hr = AssemblyBinder::BindUsingPEImage(GetAppContext(), pAssemblyName, pPEImage, PeKind, pIMetaDataAssemblyImport, &pCoreCLRFoundAssembly);
+        hr = AssemblyBinder::BindUsingPEImage(this, pAssemblyName, pPEImage, PeKind, pIMetaDataAssemblyImport, &pCoreCLRFoundAssembly);
         if (hr == S_OK)
         {
             _ASSERTE(pCoreCLRFoundAssembly != NULL);
@@ -190,8 +190,7 @@ HRESULT CLRPrivBinderAssemblyLoadContext::SetupContext(CLRPrivBinderCoreCLR *pTP
             ReleaseHolder<CLRPrivBinderAssemblyLoadContext> pBinder;
 
             SAFE_NEW(pBinder, CLRPrivBinderAssemblyLoadContext);
-            UINT_PTR binderId = pBinder->GetBinderID();
-            hr = pBinder->GetAppContext()->Init(binderId);
+            hr = pBinder->GetAppContext()->Init();
             if(SUCCEEDED(hr))
             {
                 // Save reference to the TPABinder that is required to be present.

src/coreclr/binder/clrprivbindercoreclr.cpp

@@ -23,7 +23,7 @@ HRESULT CLRPrivBinderCoreCLR::BindAssemblyByNameWorker(BINDER_SPACE::AssemblyNam
     _ASSERTE(!pAssemblyName->IsCoreLib());
 #endif
 
-    hr = AssemblyBinder::BindAssembly(GetAppContext(),
+    hr = AssemblyBinder::BindAssembly(this,
                                       pAssemblyName,
                                       NULL,
                                       NULL,
@@ -190,7 +190,7 @@ HRESULT CLRPrivBinderCoreCLR::BindUsingPEImage( /* in */ PEImage *pPEImage,
             }
         }
 
-        hr = AssemblyBinder::BindUsingPEImage(GetAppContext(), pAssemblyName, pPEImage, PeKind, pIMetaDataAssemblyImport, &pCoreCLRFoundAssembly);
+        hr = AssemblyBinder::BindUsingPEImage(this, pAssemblyName, pPEImage, PeKind, pIMetaDataAssemblyImport, &pCoreCLRFoundAssembly);
         if (hr == S_OK)
         {
             _ASSERTE(pCoreCLRFoundAssembly != NULL);
@@ -235,7 +235,7 @@ HRESULT CLRPrivBinderCoreCLR::Bind(LPCWSTR            wszCodeBase,
     EX_TRY
     {
         ReleaseHolder<BINDER_SPACE::Assembly> pAsm;
-        hr = AssemblyBinder::BindAssembly(GetAppContext(),
+        hr = AssemblyBinder::BindAssembly(this,
                                           NULL,
                                           wszCodeBase,
                                           pParentAssembly,

src/coreclr/binder/coreclrbindercommon.cpp

@@ -21,8 +21,7 @@ HRESULT CCoreCLRBinderHelper::DefaultBinderSetupContext(CLRPrivBinderCoreCLR **p
             SAFE_NEW(pBinder, CLRPrivBinderCoreCLR);
 
             BINDER_SPACE::ApplicationContext *pApplicationContext = pBinder->GetAppContext();
-            UINT_PTR binderId = pBinder->GetBinderID();
-            hr = pApplicationContext->Init(binderId);
+            hr = pApplicationContext->Init();
             if(SUCCEEDED(hr))
             {
                 pBinder->SetManagedAssemblyLoadContext(NULL);

src/coreclr/binder/inc/applicationcontext.hpp

@@ -85,7 +85,7 @@ namespace BINDER_SPACE
         // ApplicationContext methods
         ApplicationContext();
         ~ApplicationContext();
-        HRESULT Init(UINT_PTR binderID);
+        HRESULT Init();
 
         inline SString &GetApplicationName();
 
@@ -114,8 +114,6 @@ namespace BINDER_SPACE
         inline LONG GetVersion();
         inline void IncrementVersion();
 
-        UINT_PTR GetBinderID() { return m_binderID; }
-
     private:
         Volatile<LONG>     m_cVersion;
         SString            m_applicationName;
@@ -130,8 +128,6 @@ namespace BINDER_SPACE
         StringArrayList    m_appNiPaths;
 
         SimpleNameToFileNameMap * m_pTrustedPlatformAssemblyMap;
-
-        UINT_PTR m_binderID;
     };
 
 #include "applicationcontext.inl"

src/coreclr/binder/inc/assembly.hpp

@@ -60,7 +60,6 @@ namespace BINDER_SPACE
         ULONG Release();
 
         LPCWSTR GetSimpleName();
-        UINT_PTR GetBinderID();
         AssemblyLoaderAllocator* GetLoaderAllocator();
 
         // --------------------------------------------------------------------

src/coreclr/binder/inc/assemblybinder.hpp

@@ -18,6 +18,7 @@
 #include "bindresult.hpp"
 #include "bundle.h"
 
+class ICLRPrivBinder;
 class CLRPrivBinderCoreCLR;
 class PEAssembly;
 class PEImage;
@@ -30,7 +31,7 @@ namespace BINDER_SPACE
         // See code:BINDER_SPACE::AssemblyBinder::GetAssembly for info on fNgenExplicitBind
         // and fExplicitBindToNativeImage, and see code:CEECompileInfo::LoadAssemblyByPath
         // for an example of how they're used.
-        static HRESULT BindAssembly(/* in */  ApplicationContext  *pApplicationContext,
+        static HRESULT BindAssembly(/* in */  ICLRPrivBinder      *pBinder, 
                                     /* in */  AssemblyName        *pAssemblyName,
                                     /* in */  LPCWSTR              szCodeBase,
                                     /* in */  PEAssembly          *pParentAssembly,
@@ -61,7 +62,7 @@ namespace BINDER_SPACE
                                                       /* in */ CLRPrivBinderCoreCLR *pTPABinder,
                                                       /* out */ Assembly           **ppAssembly);
 
-        static HRESULT BindUsingPEImage(/* in */  ApplicationContext *pApplicationContext,
+        static HRESULT BindUsingPEImage(/* in */  ICLRPrivBinder     *pBinder,
                                         /* in */  BINDER_SPACE::AssemblyName *pAssemblyName,
                                         /* in */  PEImage            *pPEImage,
                                         /* in */  PEKIND              peKind,

src/coreclr/binder/inc/bindertracing.h

@@ -93,8 +93,8 @@ namespace BinderTracing
         static void TraceAppDomainAssemblyResolve(AssemblySpec *spec, PEAssembly *resultAssembly, Exception *exception = nullptr);
 
     public:
-        // One of binder ID and managed ALC is expected to be non-zero. If the managed ALC is set, binder ID is ignored.
-        ResolutionAttemptedOperation(BINDER_SPACE::AssemblyName *assemblyName, UINT_PTR binderId, INT_PTR managedALC, const HRESULT& hr);
+        // One of native bindContext or managedALC is expected to be non-zero. If the managed ALC is set, bindContext is ignored.
+        ResolutionAttemptedOperation(BINDER_SPACE::AssemblyName *assemblyName, ICLRPrivBinder* bindContext, INT_PTR managedALC, const HRESULT& hr);
 
         void TraceBindResult(const BINDER_SPACE::BindResult &bindResult, bool mvidMismatch = false);
 

src/coreclr/vm/assemblyloadcontext.h

@@ -43,18 +43,6 @@ class ICLRPrivBinder
      **********************************************************************************/
     virtual AssemblyLoaderAllocator* GetLoaderAllocator() = 0;
 
-    /**********************************************************************************
-     ** GetBinderID
-     **  pBinderId, pointer to binder id. The binder id has the following properties
-     **        It is a pointer that does not change over the lifetime of a binder object
-     **        It points at an object in memory that will remain allocated for the lifetime of the binder.
-     **        This value should be the same for a set of binder objects that represent the same binder behavior.
-     **********************************************************************************/
-    UINT_PTR GetBinderID()
-    {
-        return reinterpret_cast<UINT_PTR>(this);
-    }
-
     inline BINDER_SPACE::ApplicationContext* GetAppContext()
     {
         return &m_appContext;

src/coreclr/vm/assemblyspec.cpp

@@ -1007,7 +1007,6 @@ AssemblySpecBindingCache::AssemblyBinding* AssemblySpecBindingCache::LookupInter
     CONTRACTL_END;
 
     UPTR key = (UPTR)pSpec->Hash();
-    UPTR lookupKey = key;
 
     // On CoreCLR, we will use the BinderID as the key
     ICLRPrivBinder *pBinderContextForLookup = NULL;
@@ -1044,11 +1043,10 @@ AssemblySpecBindingCache::AssemblyBinding* AssemblySpecBindingCache::LookupInter
 
     if (pBinderContextForLookup)
     {
-        UINT_PTR binderID = pBinderContextForLookup->GetBinderID();
-        lookupKey = key^binderID;
+        key = key ^ (UPTR)pBinderContextForLookup;
     }
 
-    AssemblyBinding* pEntry = (AssemblyBinding *)m_map.LookupValue(lookupKey, pSpec);
+    AssemblyBinding* pEntry = (AssemblyBinding *)m_map.LookupValue(key, pSpec);
 
     // Reset the binding context if one was originally never present in the AssemblySpec and we didnt find any entry
     // in the cache.
@@ -1260,8 +1258,7 @@ BOOL AssemblySpecBindingCache::StoreAssembly(AssemblySpec *pSpec, DomainAssembly
     _ASSERTE(pBinderContextForLookup || pAssembly->GetFile()->IsSystem());
     if (pBinderContextForLookup)
     {
-        UINT_PTR binderID = pBinderContextForLookup->GetBinderID();
-        key = key^binderID;
+        key = key ^ (UPTR)pBinderContextForLookup;
 
         if (!pSpec->GetBindingContext())
         {
@@ -1343,8 +1340,7 @@ BOOL AssemblySpecBindingCache::StoreFile(AssemblySpec *pSpec, PEAssembly *pFile)
     _ASSERTE(pBinderContextForLookup || pFile->IsSystem());
     if (pBinderContextForLookup)
     {
-        UINT_PTR binderID = pBinderContextForLookup->GetBinderID();
-        key = key^binderID;
+        key = key ^ (UPTR)pBinderContextForLookup;
 
         if (!pSpec->GetBindingContext())
         {
@@ -1436,8 +1432,7 @@ BOOL AssemblySpecBindingCache::StoreException(AssemblySpec *pSpec, Exception* pE
             if (!pSpec->IsAssemblySpecForCoreLib())
             {
                 pBinderToSaveException = pSpec->GetBindingContextFromParentAssembly(pSpec->GetAppDomain());
-                UINT_PTR binderID = pBinderToSaveException->GetBinderID();
-                key = key^binderID;
+                key = key ^ (UPTR)pBinderToSaveException;
             }
         }
     }

src/coreclr/vm/nativelibrary.cpp

@@ -332,8 +332,7 @@ namespace
             return NULL;
         }
 
-        UINT_PTR assemblyBinderID = pBindingContext->GetBinderID();
-        ICLRPrivBinder *pCurrentBinder = reinterpret_cast<ICLRPrivBinder *>(assemblyBinderID);
+        ICLRPrivBinder *pCurrentBinder = pBindingContext;
 
         // For assemblies bound via TPA binder, we should use the standard mechanism to make the pinvoke call.
         if (pCurrentBinder == pTPABinder)

src/coreclr/vm/pefile.cpp

@@ -402,10 +402,10 @@ BOOL PEFile::Equals(PEFile *pFile)
     // because another thread beats it; the losing thread will pick up the PEAssembly in the cache.
     if (pFile->HasHostAssembly() && this->HasHostAssembly())
     {
-        UINT_PTR fileBinderId = pFile->GetHostAssembly()->GetBinderID();
-        UINT_PTR thisBinderId = this->GetHostAssembly()->GetBinderID();
+        ICLRPrivBinder* fileBinderId = pFile->GetHostAssembly()->GetBinder();
+        ICLRPrivBinder* thisBinderId = this->GetHostAssembly()->GetBinder();
 
-        if (fileBinderId != thisBinderId || fileBinderId == 0)
+        if (fileBinderId != thisBinderId || fileBinderId == NULL)
             return FALSE;
     }