Skip to content

Commit 51a84a8

Browse files
am11am11
committed
Move more helpers from DomainAssembly to Assembly
1 parent 438cf85 commit 51a84a8

13 files changed

+668
-813
lines changed

‎src/coreclr/debug/daccess/dacdbiimpl.cpp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,7 @@ void DacDbiInterfaceImpl::GetCompilerFlags (
672672
}
673673

674674
// Get the underlying module - none of this is AppDomain specific
675-
Module * pModule = pDomainAssembly->GetModule();
675+
Module * pModule = pDomainAssembly->GetAssembly()->GetModule();
676676
DWORD dwBits = pModule->GetDebuggerInfoBits();
677677
*pfAllowJITOpts = !CORDisableJITOptimizations(dwBits);
678678
*pfEnableEnC = pModule->IsEditAndContinueEnabled();
@@ -721,7 +721,7 @@ HRESULT DacDbiInterfaceImpl::SetCompilerFlags(VMPTR_DomainAssembly vmDomainAssem
721721

722722
DWORD dwBits = 0;
723723
DomainAssembly * pDomainAssembly = vmDomainAssembly.GetDacPtr();
724-
Module * pModule = pDomainAssembly->GetModule();
724+
Module * pModule = pDomainAssembly->GetAssembly()->GetModule();
725725
HRESULT hr = S_OK;
726726

727727

@@ -821,7 +821,7 @@ SIZE_T DacDbiInterfaceImpl::GetArgCount(MethodDesc * pMD)
821821
return 0;
822822
}
823823

824-
MetaSig msig(pCallSig, cbCallSigSize, pMD->GetModule(), NULL, MetaSig::sigMember);
824+
MetaSig msig(pCallSig, cbCallSigSize, pMD->GetAssembly()->GetModule(), NULL, MetaSig::sigMember);
825825

826826
// Get the arg count.
827827
UINT32 NumArguments = msig.NumFixedArgs();
@@ -1019,7 +1019,7 @@ void DacDbiInterfaceImpl::GetSequencePoints(MethodDesc * pMethodDesc,
10191019
#endif
10201020
// if there is a profiler load-time mapping and not a rejit mapping, apply that instead
10211021
InstrumentedILOffsetMapping loadTimeMapping =
1022-
pMethodDesc->GetModule()->GetInstrumentedILOffsetMapping(pMethodDesc->GetMemberDef());
1022+
pMethodDesc->GetAssembly()->GetModule()->GetInstrumentedILOffsetMapping(pMethodDesc->GetMemberDef());
10231023
ComposeMapping(&loadTimeMapping, mapCopy, &entryCount);
10241024
#ifdef FEATURE_REJIT
10251025
}
@@ -1091,7 +1091,7 @@ void DacDbiInterfaceImpl::GetILCodeAndSig(VMPTR_DomainAssembly vmDomainAssembly,
10911091
DD_ENTER_MAY_THROW;
10921092

10931093
DomainAssembly * pDomainAssembly = vmDomainAssembly.GetDacPtr();
1094-
Module * pModule = pDomainAssembly->GetModule();
1094+
Module * pModule = pDomainAssembly->GetAssembly()->GetModule();
10951095
RVA methodRVA = 0;
10961096
DWORD implFlags;
10971097

@@ -1330,7 +1330,7 @@ void DacDbiInterfaceImpl::GetNativeCodeInfo(VMPTR_DomainAssembly vmDomai
13301330
pCodeInfo->Clear();
13311331

13321332
DomainAssembly * pDomainAssembly = vmDomainAssembly.GetDacPtr();
1333-
Module * pModule = pDomainAssembly->GetModule();
1333+
Module * pModule = pDomainAssembly->GetAssembly()->GetModule();
13341334

13351335
MethodDesc* pMethodDesc = FindLoadedMethodRefOrDef(pModule, functionToken);
13361336
pCodeInfo->vmNativeCodeMethodDescToken.SetHostPtr(pMethodDesc);
@@ -2866,7 +2866,7 @@ TypeHandle DacDbiInterfaceImpl::GetClassOrValueTypeHandle(DebuggerIPCE_BasicType
28662866
else
28672867
{
28682868
DomainAssembly * pDomainAssembly = pData->vmDomainAssembly.GetDacPtr();
2869-
Module * pModule = pDomainAssembly->GetModule();
2869+
Module * pModule = pDomainAssembly->GetAssembly()->GetModule();
28702870

28712871
typeHandle = ClassLoader::LookupTypeDefOrRefInModule(pModule, pData->metadataToken);
28722872
if (typeHandle.IsNull())
@@ -3842,7 +3842,7 @@ FieldDesc * DacDbiInterfaceImpl::GetEnCFieldDesc(const EnCHangingFieldInfo * pEn
38423842
FieldDesc * pFD = NULL;
38433843

38443844
DomainAssembly * pDomainAssembly = pEnCFieldInfo->GetObjectTypeData().vmDomainAssembly.GetDacPtr();
3845-
Module * pModule = pDomainAssembly->GetModule();
3845+
Module * pModule = pDomainAssembly->GetAssembly()->GetModule();
38463846

38473847
// get the type handle for the object
38483848
TypeHandle typeHandle = ClassLoader::LookupTypeDefOrRefInModule(pModule,
@@ -3881,7 +3881,7 @@ PTR_CBYTE DacDbiInterfaceImpl::GetPtrToEnCField(FieldDesc * pFD, const EnCHangin
38813881

38823882
PTR_EditAndContinueModule pEnCModule;
38833883
DomainAssembly * pDomainAssembly = pEnCFieldInfo->GetObjectTypeData().vmDomainAssembly.GetDacPtr();
3884-
Module * pModule = pDomainAssembly->GetModule();
3884+
Module * pModule = pDomainAssembly->GetAssembly()->GetModule();
38853885

38863886
// make sure we actually have an EditAndContinueModule
38873887
_ASSERTE(pModule->IsEditAndContinueCapable());
@@ -4053,7 +4053,7 @@ void DacDbiInterfaceImpl::ResolveTypeReference(const TypeRefData * pTypeRefInfo,
40534053
{
40544054
DD_ENTER_MAY_THROW;
40554055
DomainAssembly * pDomainAssembly = pTypeRefInfo->vmDomainAssembly.GetDacPtr();
4056-
Module * pReferencingModule = pDomainAssembly->GetModule();
4056+
Module * pReferencingModule = pDomainAssembly->GetAssembly()->GetModule();
40574057
BOOL fSuccess = FALSE;
40584058

40594059
// Resolve the type ref
@@ -4317,7 +4317,7 @@ void DacDbiInterfaceImpl::GetModuleForDomainAssembly(VMPTR_DomainAssembly vmDoma
43174317
_ASSERTE(pModule != NULL);
43184318

43194319
DomainAssembly * pDomainAssembly = vmDomainAssembly.GetDacPtr();
4320-
pModule->SetHostPtr(pDomainAssembly->GetModule());
4320+
pModule->SetHostPtr(pDomainAssembly->GetAssembly()->GetModule());
43214321
}
43224322

43234323

@@ -4446,7 +4446,7 @@ void DacDbiInterfaceImpl::EnumerateModulesInAssembly(
44464446
DomainAssembly * pDomainAssembly = vmAssembly.GetDacPtr();
44474447

44484448
// Debugger isn't notified of Resource / Inspection-only modules.
4449-
if (pDomainAssembly->GetModule()->IsVisibleToDebugger())
4449+
if (pDomainAssembly->GetAssembly()->GetModule()->IsVisibleToDebugger())
44504450
{
44514451
// If domain assembly isn't yet loaded, just return
44524452
if (!pDomainAssembly->GetAssembly()->IsLoaded())
@@ -4469,7 +4469,7 @@ VMPTR_DomainAssembly DacDbiInterfaceImpl::ResolveAssembly(
44694469

44704470

44714471
DomainAssembly * pDomainAssembly = vmScope.GetDacPtr();
4472-
Module * pModule = pDomainAssembly->GetModule();
4472+
Module * pModule = pDomainAssembly->GetAssembly()->GetModule();
44734473

44744474
VMPTR_DomainAssembly vmDomainAssembly = VMPTR_DomainAssembly::NullPtr();
44754475

‎src/coreclr/debug/ee/debugger.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5134,8 +5134,8 @@ DebuggerModule * Debugger::LookupOrCreateModule(DomainAssembly * pDomainAssembly
51345134
{
51355135
_ASSERTE(pDomainAssembly != NULL);
51365136
LOG((LF_CORDB, LL_INFO1000, "D::LOCM df=%p\n", pDomainAssembly));
5137-
DebuggerModule * pDModule = LookupOrCreateModule(pDomainAssembly->GetModule());
5138-
LOG((LF_CORDB, LL_INFO1000, "D::LOCM m=%p ad=%p -> dm=%p\n", pDomainAssembly->GetModule(), AppDomain::GetCurrentDomain(), pDModule));
5137+
DebuggerModule * pDModule = LookupOrCreateModule(pDomainAssembly->GetAssembly()->GetModule());
5138+
LOG((LF_CORDB, LL_INFO1000, "D::LOCM m=%p ad=%p -> dm=%p\n", pDomainAssembly->GetAssembly()->GetModule(), AppDomain::GetCurrentDomain(), pDModule));
51395139
_ASSERTE(pDModule != NULL);
51405140
_ASSERTE(pDModule->GetDomainAssembly() == pDomainAssembly);
51415141

@@ -5235,7 +5235,7 @@ DebuggerModule* Debugger::AddDebuggerModule(DomainAssembly * pDomainAssembly)
52355235
LOG((LF_CORDB, LL_INFO1000, "D::ADM df=0x%x\n", pDomainAssembly));
52365236
DebuggerDataLockHolder chInfo(this);
52375237

5238-
Module * pRuntimeModule = pDomainAssembly->GetModule();
5238+
Module * pRuntimeModule = pDomainAssembly->GetAssembly()->GetModule();
52395239

52405240
HRESULT hr = CheckInitModuleTable();
52415241
IfFailThrow(hr);
@@ -8041,7 +8041,7 @@ BOOL Debugger::ShouldSendCustomNotification(DomainAssembly *pAssembly, mdTypeDef
80418041
}
80428042
CONTRACTL_END;
80438043

8044-
Module *pModule = pAssembly->GetModule();
8044+
Module *pModule = pAssembly->GetAssembly()->GetModule();
80458045
TypeInModule tim(pModule, typeDef);
80468046
return !(m_pCustomNotificationTable->Lookup(tim).IsNull());
80478047
}
@@ -9402,7 +9402,7 @@ void Debugger::LoadModule(Module* pRuntimeModule,
94029402
// We should simply things when we actually get rid of DebuggerModule, possibly by just passing the
94039403
// DomainAssembly around.
94049404
_ASSERTE(module->GetDomainAssembly() == pDomainAssembly);
9405-
_ASSERTE(module->GetRuntimeModule() == pDomainAssembly->GetModule());
9405+
_ASSERTE(module->GetRuntimeModule() == pDomainAssembly->GetAssembly()->GetModule());
94069406

94079407
// Send a load module event to the Right Side.
94089408
ipce = m_pRCThread->GetIPCEventSendBuffer();
@@ -10830,7 +10830,7 @@ bool Debugger::HandleIPCEvent(DebuggerIPCEvent * pEvent)
1083010830
// unexpected in an OOM situation. Quickly just sanity check them.
1083110831
//
1083210832
Thread * pThread = pEvent->SetIP.vmThreadToken.GetRawPtr();
10833-
Module * pModule = pEvent->SetIP.vmDomainAssembly.GetRawPtr()->GetModule();
10833+
Module * pModule = pEvent->SetIP.vmDomainAssembly.GetRawPtr()->GetAssembly()->GetModule();
1083410834

1083510835
// Get the DJI for this function
1083610836
DebuggerMethodInfo * pDMI = GetOrCreateMethodInfo(pModule, pEvent->SetIP.mdMethod);

‎src/coreclr/vm/appdomain.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2472,7 +2472,7 @@ Assembly *AppDomain::LoadAssemblyInternal(AssemblySpec* pIdentity,
24722472

24732473
// Set the assembly module to be tenured now that we know it won't be deleted
24742474
pDomainAssembly->GetAssembly()->SetIsTenured();
2475-
if (pDomainAssembly->IsCollectible())
2475+
if (pDomainAssembly->GetAssembly()->IsCollectible())
24762476
{
24772477
// We add the assembly to the LoaderAllocator only when we are sure that it can be added
24782478
// and won't be deleted in case of a concurrent load from the same ALC
@@ -4427,7 +4427,7 @@ AppDomain::EnumMemoryRegions(CLRDataEnumMemoryFlags flags, bool enumThis)
44274427

44284428
while (assem.Next(pAssembly.This()))
44294429
{
4430-
pAssembly->GetDomainAssembly()->EnumMemoryRegions(flags);
4430+
pAssembly->EnumMemoryRegions(flags);
44314431
}
44324432
}
44334433

‎src/coreclr/vm/appdomain.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -544,12 +544,12 @@ class CollectibleAssemblyHolderBase
544544
LoaderAllocator * GetLoaderAllocator(DomainAssembly * pDomainAssembly)
545545
{
546546
WRAPPER_NO_CONTRACT;
547-
return pDomainAssembly->GetLoaderAllocator();
547+
return pDomainAssembly->GetAssembly()->GetLoaderAllocator();
548548
}
549549
BOOL IsCollectible(DomainAssembly * pDomainAssembly)
550550
{
551551
WRAPPER_NO_CONTRACT;
552-
return pDomainAssembly->IsCollectible();
552+
return pDomainAssembly->GetAssembly()->IsCollectible();
553553
}
554554
LoaderAllocator * GetLoaderAllocator(Assembly * pAssembly)
555555
{

0 commit comments

Comments
 (0)