File tree 3 files changed +3
-35
lines changed
3 files changed +3
-35
lines changed Original file line number Diff line number Diff line change @@ -961,19 +961,7 @@ Module * Assembly::FindModuleByTypeRef(
961
961
962
962
void Assembly::CacheManifestExportedTypes (AllocMemTracker *pamTracker)
963
963
{
964
- CONTRACT_VOID
965
- {
966
- THROWS;
967
- GC_TRIGGERS;
968
- INJECT_FAULT (COMPlusThrowOM (););
969
- }
970
- CONTRACT_END;
971
-
972
- // Prejitted assemblies are expected to have their table prebuilt.
973
- // If not, we do it here at load time (as if we would jit the assembly).
974
-
975
- if (m_pModule->IsPersistedObject (m_pModule->m_pAvailableClasses ))
976
- RETURN;
964
+ STANDARD_VM_CONTRACT;
977
965
978
966
mdToken mdExportedType;
979
967
@@ -987,24 +975,13 @@ void Assembly::CacheManifestExportedTypes(AllocMemTracker *pamTracker)
987
975
m_pClassLoader->AddExportedTypeHaveLock (GetModule (),
988
976
mdExportedType,
989
977
pamTracker);
990
-
991
- RETURN;
992
978
}
993
979
994
- // <TODO>@TODO: if module is not signed it needs to acquire the
995
- // permissions from the assembly.</TODO>
996
980
void Assembly::PrepareModuleForAssembly (Module* module, AllocMemTracker *pamTracker)
997
981
{
998
- CONTRACTL
999
- {
1000
- THROWS;
1001
- GC_TRIGGERS;
1002
- INJECT_FAULT (COMPlusThrowOM (););
1003
- PRECONDITION (CheckPointer (module));
1004
- }
1005
- CONTRACTL_END;
982
+ STANDARD_VM_CONTRACT;
1006
983
1007
- if (module->m_pAvailableClasses != NULL && !module-> IsPersistedObject (module-> m_pAvailableClasses ) )
984
+ if (module->m_pAvailableClasses != NULL )
1008
985
{
1009
986
// ! We intentionally do not take the AvailableClass lock here. It creates problems at
1010
987
// startup and we haven't yet published the module yet so nobody should be searching it.
Original file line number Diff line number Diff line change @@ -352,12 +352,6 @@ Module::Module(Assembly *pAssembly, PEAssembly *pPEAssembly)
352
352
pPEAssembly->AddRef ();
353
353
}
354
354
355
- BOOL Module::IsPersistedObject (void *address)
356
- {
357
- LIMITED_METHOD_CONTRACT;
358
- return FALSE ;
359
- }
360
-
361
355
uint32_t Module::GetNativeMetadataAssemblyCount ()
362
356
{
363
357
if (m_pNativeImage != NULL )
Original file line number Diff line number Diff line change @@ -1079,9 +1079,6 @@ class Module : public ModuleBase
1079
1079
// Note that this may require calling into managed code (to resolve security policy).
1080
1080
BOOL IsSymbolReadingEnabled (void );
1081
1081
1082
- BOOL IsPersistedObject (void *address);
1083
-
1084
-
1085
1082
// Get the in-memory symbol stream for this module, if any.
1086
1083
// If none, this will return null. This is used by modules loaded in-memory (eg. from a byte-array)
1087
1084
// and by dynamic modules.
You can’t perform that action at this time.
0 commit comments