Remove wrapper ID as a concept entirely

Author: jkoritzinsky

src/coreclr/System.Private.CoreLib/src/System/Runtime/InteropServices/ComWrappers.cs

@@ -23,16 +23,13 @@ public static unsafe partial void GetIUnknownImpl(out IntPtr fpQueryInterface, o
         [LibraryImport(RuntimeHelpers.QCall, EntryPoint = "ComWrappers_GetIUnknownImpl")]
         private static partial void GetIUnknownImplInternal(out IntPtr fpQueryInterface, out IntPtr fpAddRef, out IntPtr fpRelease);
 
-        private static long s_instanceCounter;
-        private readonly long id = Interlocked.Increment(ref s_instanceCounter);
-
         unsafe partial void RegisterManagedObjectWrapperForDiagnostics(object instance, ManagedObjectWrapper* wrapper)
         {
-            RegisterManagedObjectWrapperForDiagnosticsInternal(ObjectHandleOnStack.Create(ref instance), wrapper, id);
+            RegisterManagedObjectWrapperForDiagnosticsInternal(ObjectHandleOnStack.Create(ref instance), wrapper);
         }
 
         [LibraryImport(RuntimeHelpers.QCall, EntryPoint = "ComWrappers_RegisterManagedObjectWrapperForDiagnostics")]
-        private static unsafe partial void RegisterManagedObjectWrapperForDiagnosticsInternal(ObjectHandleOnStack instance, ManagedObjectWrapper* wrapper, long wrapperId);
+        private static unsafe partial void RegisterManagedObjectWrapperForDiagnosticsInternal(ObjectHandleOnStack instance, ManagedObjectWrapper* wrapper);
 
         static partial void RegisterNativeObjectWrapperForDiagnostics(NativeObjectWrapper registeredWrapper)
         {

src/coreclr/debug/daccess/request.cpp

@@ -5086,17 +5086,17 @@ HRESULT ClrDataAccess::GetObjectComWrappersData(CLRDATA_ADDRESS objAddr, CLRDATA
                 *rcw = TO_TADDR(pInfo->m_externalComObjectContext);
             }
 
-            DPTR(NewHolder<ManagedObjectComWrapperByIdMap>) mapHolder(PTR_TO_MEMBER_TADDR(InteropSyncBlockInfo, pInfo, m_managedObjectComWrapperMap));
-            DPTR(ManagedObjectComWrapperByIdMap *)ppMap(PTR_TO_MEMBER_TADDR(NewHolder<ManagedObjectComWrapperByIdMap>, mapHolder, m_value));
-            DPTR(ManagedObjectComWrapperByIdMap) pMap(TO_TADDR(*ppMap));
+            DPTR(NewHolder<ManagedObjectComWrapperSet>) mapHolder(PTR_TO_MEMBER_TADDR(InteropSyncBlockInfo, pInfo, m_managedObjectComWrapperSet));
+            DPTR(ManagedObjectComWrapperSet *)ppMap(PTR_TO_MEMBER_TADDR(NewHolder<ManagedObjectComWrapperSet>, mapHolder, m_value));
+            DPTR(ManagedObjectComWrapperSet) pMap(TO_TADDR(*ppMap));
 
             CQuickArrayList<CLRDATA_ADDRESS> comWrappers;
             if (pMap != NULL)
             {
-                ManagedObjectComWrapperByIdMap::Iterator iter = pMap->Begin();
+                ManagedObjectComWrapperSet::Iterator iter = pMap->Begin();
                 while (iter != pMap->End())
                 {
-                    comWrappers.Push(TO_CDADDR(iter->Value()));
+                    comWrappers.Push(TO_CDADDR(*iter));
                     ++iter;
 
                 }

src/coreclr/vm/interoplibinterface_comwrappers.cpp

@@ -225,8 +225,7 @@ extern "C" void QCALLTYPE ComWrappers_GetTaggedImpl(
 
 extern "C" void QCALLTYPE ComWrappers_RegisterManagedObjectWrapperForDiagnostics(
     _In_ QCall::ObjectHandleOnStack obj,
-    _In_ void* wrapper,
-    _In_ long wrapperId)
+    _In_ void* wrapper)
 {
     QCALL_CONTRACT;
 
@@ -242,7 +241,7 @@ extern "C" void QCALLTYPE ComWrappers_RegisterManagedObjectWrapperForDiagnostics
     InteropSyncBlockInfo* interopInfo = syncBlock->GetInteropInfo();
     _ASSERTE(syncBlock->IsPrecious());
 
-    interopInfo->TrySetManagedObjectComWrapper(wrapperId, wrapper);
+    interopInfo->AddManagedObjectComWrapper(wrapper);
 
     GCPROTECT_END();
 

src/coreclr/vm/syncblk.cpp

@@ -71,7 +71,7 @@ InteropSyncBlockInfo::~InteropSyncBlockInfo()
     FreeUMEntryThunk();
 
 #if defined(FEATURE_COMWRAPPERS)
-    delete m_managedObjectComWrapperMap;
+    delete m_managedObjectComWrapperSet;
 #endif // FEATURE_COMWRAPPERS
 }
 

src/coreclr/vm/syncblk.h

@@ -611,8 +611,18 @@ typedef DPTR(class ComCallWrapper)        PTR_ComCallWrapper;
 
 #include "shash.h"
 #endif // FEATURE_COMINTEROP
+class ManagedObjectComWrapperTraits final : public NoRemoveSHashTraits<DefaultSHashTraits<void *>>
+{
+public:
+    typedef LPVOID key_t;
+    static void *Null()                         { LIMITED_METHOD_CONTRACT; return NULL; }
+    static bool IsNull(void* *e)                 { LIMITED_METHOD_CONTRACT; return (e == NULL); }
+    static const LPVOID GetKey(void *e)         { LIMITED_METHOD_CONTRACT; return e; }
+    static count_t Hash(LPVOID key_t)          { LIMITED_METHOD_CONTRACT; return (count_t)(size_t) key_t; }
+    static BOOL Equals(LPVOID lhs, LPVOID rhs) { LIMITED_METHOD_CONTRACT; return (lhs == rhs); }
+};
 
-using ManagedObjectComWrapperByIdMap = MapSHash<INT64, void*>;
+using ManagedObjectComWrapperSet = SHash<ManagedObjectComWrapperTraits<void*>>;
 class InteropSyncBlockInfo
 {
     friend class RCWHolder;
@@ -636,7 +646,7 @@ class InteropSyncBlockInfo
 #ifdef FEATURE_COMWRAPPERS
         , m_externalComObjectContext{}
         , m_managedObjectComWrapperLock{}
-        , m_managedObjectComWrapperMap{}
+        , m_managedObjectComWrapperSet{}
 #endif // FEATURE_COMWRAPPERS
 #ifdef FEATURE_OBJCMARSHAL
         , m_taggedMemory{}
@@ -805,27 +815,24 @@ class InteropSyncBlockInfo
 #if defined(FEATURE_COMWRAPPERS)
 public:
 #ifndef DACCESS_COMPILE
-    bool TrySetManagedObjectComWrapper(_In_ INT64 wrapperId, _In_ void* mocw, _In_ void* curr = NULL)
+    bool AddManagedObjectComWrapper(_In_ void* mocw)
     {
         LIMITED_METHOD_CONTRACT;
 
-        if (m_managedObjectComWrapperMap == NULL)
+        if (m_managedObjectComWrapperSet == NULL)
         {
-            NewHolder<ManagedObjectComWrapperByIdMap> map = new ManagedObjectComWrapperByIdMap();
-            if (InterlockedCompareExchangeT(&m_managedObjectComWrapperMap, (ManagedObjectComWrapperByIdMap *)map, NULL) == NULL)
+            NewHolder<ManagedObjectComWrapperSet> map = new ManagedObjectComWrapperSet();
+            if (InterlockedCompareExchangeT(&m_managedObjectComWrapperSet, (ManagedObjectComWrapperSet *)map, NULL) == NULL)
             {
                 map.SuppressRelease();
             }
 
-            _ASSERTE(m_managedObjectComWrapperMap != NULL);
+            _ASSERTE(m_managedObjectComWrapperSet != NULL);
         }
 
         CrstHolder lock(&m_managedObjectComWrapperLock);
 
-        if (m_managedObjectComWrapperMap->LookupPtr(wrapperId) != curr)
-            return false;
-
-        m_managedObjectComWrapperMap->Add(wrapperId, mocw);
+        m_managedObjectComWrapperSet->Add(mocw);
         return true;
     }
 #endif // !DACCESS_COMPILE
@@ -854,7 +861,7 @@ class InteropSyncBlockInfo
     void* m_externalComObjectContext;
 
     CrstExplicitInit m_managedObjectComWrapperLock;
-    ManagedObjectComWrapperByIdMap* m_managedObjectComWrapperMap;
+    ManagedObjectComWrapperSet* m_managedObjectComWrapperSet;
 #endif // FEATURE_COMWRAPPERS
 
 #ifdef FEATURE_OBJCMARSHAL