Merge in 'release/6.0' changes

dotnet · Feb 14, 2022 · fa9dc99 · fa9dc99
2 parents e3e7521 + 6c9b451
commit fa9dc99
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/coreclr/vm/syncblk.h b/src/coreclr/vm/syncblk.h
@@ -621,6 +621,11 @@ class InteropSyncBlockInfo
     {
         LIMITED_METHOD_CONTRACT;
         ZeroMemory(this, sizeof(InteropSyncBlockInfo));
+
+#if defined(FEATURE_COMWRAPPERS)
+        // The GC thread does enumerate these objects so add CRST_UNSAFE_COOPGC.
+        m_managedObjectComWrapperLock.Init(CrstManagedObjectWrapperMap, CRST_UNSAFE_COOPGC);
+#endif // FEATURE_COMWRAPPERS
     }
 #ifndef DACCESS_COMPILE
     ~InteropSyncBlockInfo();
@@ -799,8 +804,6 @@ class InteropSyncBlockInfo
             if (FastInterlockCompareExchangePointer((ManagedObjectComWrapperByIdMap**)&m_managedObjectComWrapperMap, (ManagedObjectComWrapperByIdMap *)map, NULL) == NULL)
             {
                 map.SuppressRelease();
-                // The GC thread does enumerate these objects so add CRST_UNSAFE_COOPGC.
-                m_managedObjectComWrapperLock.Init(CrstManagedObjectWrapperMap, CRST_UNSAFE_COOPGC);
             }
 
             _ASSERTE(m_managedObjectComWrapperMap != NULL);