Remove some unnecessary templating in assembly binder (#78441)

src/coreclr/binder/CMakeLists.txt

@@ -35,8 +35,6 @@ set(BINDER_COMMON_HEADERS
     inc/defaultassemblybinder.h
     inc/failurecache.hpp
     inc/failurecachehashtraits.hpp
-    inc/loadcontext.hpp
-    inc/loadcontext.inl
     inc/textualidentityparser.hpp
     inc/utils.hpp
 )

src/coreclr/binder/applicationcontext.cpp

@@ -12,8 +12,8 @@
 // ============================================================
 
 #include "applicationcontext.hpp"
+#include "assemblyhashtraits.hpp"
 #include "stringarraylist.h"
-#include "loadcontext.hpp"
 #include "failurecache.hpp"
 #include "utils.hpp"
 #include "ex.h"

src/coreclr/binder/assemblybindercommon.cpp

@@ -16,8 +16,8 @@
 #include "assemblyname.hpp"
 #include "assembly.hpp"
 #include "applicationcontext.hpp"
+#include "assemblyhashtraits.hpp"
 #include "bindertracing.h"
-#include "loadcontext.hpp"
 #include "bindresult.inl"
 #include "failurecache.hpp"
 #include "utils.hpp"
@@ -1055,8 +1055,19 @@ namespace BINDER_SPACE
         {
             if (pContextEntry == NULL)
             {
+                hr = S_OK; // FindInExecutionContext returns S_FALSE when not found - reset to S_OK
+                SAFE_NEW(pContextEntry, ContextEntry);
+
+                pContextEntry->SetIsInTPA(pBindResult->GetIsInTPA());
+                pContextEntry->SetAssemblyName(pBindResult->GetAssemblyName(), TRUE /* fAddRef */);
+                pContextEntry->SetAssembly(pBindResult->GetAssembly());
+                if (pBindResult->GetIsFirstRequest())
+                {
+                    pContextEntry->SetIsFirstRequest(TRUE);
+                }
+
                 ExecutionContext *pExecutionContext = pApplicationContext->GetExecutionContext();
-                IF_FAIL_GO(pExecutionContext->Register(pBindResult));
+                pExecutionContext->Add(pContextEntry);
             }
             else
             {

src/coreclr/binder/inc/applicationcontext.hpp

@@ -78,6 +78,9 @@ namespace BINDER_SPACE
 
     typedef SHash<SimpleNameToFileNameMapTraits> SimpleNameToFileNameMap;
 
+    class AssemblyHashTraits;
+    typedef SHash<AssemblyHashTraits> ExecutionContext;
+
     class ApplicationContext
     {
     public:

src/coreclr/binder/inc/assemblyhashtraits.hpp

@@ -15,34 +15,30 @@
 #define __BINDER__ASSEMBLY_HASH_TRAITS_HPP__
 
 #include "bindertypes.hpp"
-#include "assemblyentry.hpp"
+#include "contextentry.hpp"
 #include "shash.h"
 
 namespace BINDER_SPACE
 {
-    template<typename HashEntry, DWORD dwAssemblyNameFlags>
-    class AssemblyHashTraits : public NoRemoveSHashTraits<DefaultSHashTraits<HashEntry> >
+    class AssemblyHashTraits : public DeleteElementsOnDestructSHashTraits<NoRemoveSHashTraits<DefaultSHashTraits<ContextEntry*>>>
     {
     public:
-        typedef typename NoRemoveSHashTraits<DefaultSHashTraits<HashEntry> >::element_t element_t;
-        typedef typename NoRemoveSHashTraits<DefaultSHashTraits<HashEntry> >::count_t count_t;
-
         typedef AssemblyName* key_t;
 
         // GetKey, Equals and Hash can throw due to SString
         static const bool s_NoThrow = false;
 
-        static key_t GetKey(element_t pAssemblyEntry)
+        static key_t GetKey(const element_t& pAssemblyEntry)
         {
             return pAssemblyEntry->GetAssemblyName();
         }
         static BOOL Equals(key_t pAssemblyName1, key_t pAssemblyName2)
         {
-            return pAssemblyName1->Equals(pAssemblyName2, dwAssemblyNameFlags);
+            return pAssemblyName1->Equals(pAssemblyName2, AssemblyName::INCLUDE_DEFAULT);
         }
         static count_t Hash(key_t pAssemblyName)
         {
-            return pAssemblyName->Hash(dwAssemblyNameFlags);
+            return pAssemblyName->Hash(AssemblyName::INCLUDE_DEFAULT);
         }
         static element_t Null()
         {

src/coreclr/binder/inc/bindertypes.hpp

@@ -24,7 +24,6 @@ namespace BINDER_SPACE
     class Assembly;
 
     class ContextEntry;
-    class ExecutionContext;
 
     class ApplicationContext;