@@ -346,9 +346,6 @@ Module::Module(Assembly *pAssembly, PEAssembly *pPEAssembly)
346346 m_pPEAssembly = pPEAssembly;
347347 m_dwTransientFlags = CLASSES_FREED;
348348
349- // Memory allocated on LoaderHeap is zero-filled. Spot-check it here.
350- _ASSERTE (m_pBinder == NULL );
351-
352349 pPEAssembly->AddRef ();
353350}
354351
@@ -418,20 +415,12 @@ void Module::Initialize(AllocMemTracker *pamTracker, LPCWSTR szName)
418415
419416 m_Crst.Init (CrstModule);
420417 m_LookupTableCrst.Init (CrstModuleLookupTable, CrstFlags (CRST_UNSAFE_ANYMODE | CRST_DEBUGGER_THREAD));
421- m_FixupCrst.Init (CrstModuleFixup, (CrstFlags)(CRST_HOST_BREAKABLE|CRST_REENTRANCY));
422418 m_InstMethodHashTableCrst.Init (CrstInstMethodHashTable, CRST_REENTRANCY);
423419 m_ISymUnmanagedReaderCrst.Init (CrstISymUnmanagedReader, CRST_DEBUGGER_THREAD);
424420
425421 AllocateMaps ();
426422 m_dwTransientFlags &= ~((DWORD)CLASSES_FREED); // Set flag indicating LookupMaps are now in a consistent and destructable state
427423
428- #ifdef FEATURE_COLLECTIBLE_TYPES
429- if (GetAssembly ()->IsCollectible ())
430- {
431- InterlockedOr ((LONG*)&m_dwPersistedFlags, COLLECTIBLE_MODULE);
432- }
433- #endif // FEATURE_COLLECTIBLE_TYPES
434-
435424#ifdef FEATURE_READYTORUN
436425 m_pNativeImage = NULL ;
437426 if ((m_pReadyToRunInfo = ReadyToRunInfo::Initialize (this , pamTracker)) != NULL )
@@ -723,7 +712,6 @@ void Module::Destruct()
723712 ClearInMemorySymbolStream ();
724713
725714 m_Crst.Destroy ();
726- m_FixupCrst.Destroy ();
727715 m_LookupTableCrst.Destroy ();
728716 m_InstMethodHashTableCrst.Destroy ();
729717 m_ISymUnmanagedReaderCrst.Destroy ();
@@ -830,6 +818,12 @@ MethodTable *Module::GetGlobalMethodTable()
830818
831819#endif // !DACCESS_COMPILE
832820
821+ BOOL Module::IsCollectible ()
822+ {
823+ LIMITED_METHOD_DAC_CONTRACT;
824+ return GetAssembly ()->IsCollectible ();
825+ }
826+
833827BOOL Module::IsManifest ()
834828{
835829 WRAPPER_NO_CONTRACT;
@@ -4543,10 +4537,6 @@ void Module::EnumMemoryRegions(CLRDataEnumMemoryFlags flags,
45434537 {
45444538 m_pAvailableClassesCaseIns->EnumMemoryRegions (flags);
45454539 }
4546- if (m_pBinder.IsValid ())
4547- {
4548- m_pBinder->EnumMemoryRegions (flags);
4549- }
45504540
45514541 // Save the LookupMap structures.
45524542 m_MethodDefToDescMap.ListEnumMemoryRegions (flags);
0 commit comments