Skip to content

More cleanups in assembly loader area #63157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
VSadov merged 25 commits into from
Jan 29, 2022
Merged

More cleanups in assembly loader area #63157

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
7c3b570
GetManifestFile() --> GetPEAssembly()
VSadov Dec 24, 2021
1bfed85
GetManifestImport() -> GetMDImport()
VSadov Dec 24, 2021
b99316e
removed GetCurrentAssembly(), GetLoadedAssembly()
VSadov Dec 24, 2021
b907403
removed GetCurrentModule(), GetLoadedModule()
VSadov Dec 24, 2021
0f1c732
fix
VSadov Dec 25, 2021
82f2ffa
removed DomainFile::ModuleIterator
VSadov Dec 25, 2021
bc797ba
renamed Assembly::GetManifestModule() --> GetModule()
VSadov Dec 25, 2021
f7dae8d
Removed Assembly::ModuleIterator
VSadov Dec 27, 2021
d02dc08
move most fields off DomainAssembly
VSadov Dec 28, 2021
0248e3a
DomainAssembly is a complete proxy
VSadov Dec 28, 2021
c793d4e
some DomainFile --> DomainAssembly renames.
VSadov Dec 28, 2021
c5df253
deleted DomainFile class
VSadov Dec 28, 2021
04b7e7e
renamed files
VSadov Dec 28, 2021
2365789
a few minor cleanups
VSadov Dec 28, 2021
987aa5d
DomainAssembly does not need to have VPTR_. Couple other changes.
VSadov Dec 30, 2021
0c7926f
More DomainFile --> DomainAssembly renames
VSadov Dec 30, 2021
b359988
More DomainFile --> DomainAssembly renames
VSadov Dec 30, 2021
4359b0e
a few more renames
VSadov Dec 30, 2021
91a5f93
removed domainassembly.inl
VSadov Dec 30, 2021
9222df3
domainassembly.h cleanup
VSadov Dec 30, 2021
8ea72ed
make gcc happy
VSadov Dec 30, 2021
ca767c1
couple more changes
VSadov Jan 11, 2022
47db770
fixed build after rebasing
VSadov Jan 21, 2022
be348b9
PR feedback
VSadov Jan 26, 2022
0caa838
more PR feedback
VSadov Jan 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
some DomainFile --> DomainAssembly renames.
  • Loading branch information
@VSadov
VSadov committed Jan 21, 2022
commit c793d4e8501e6f539a78308f130eecf640b1ae17
80 changes: 40 additions & 40 deletions src/coreclr/debug/daccess/dacdbiimpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -663,15 +663,15 @@ void DacDbiInterfaceImpl::GetCompilerFlags (
{
DD_ENTER_MAY_THROW;

DomainFile * pDomainFile = vmDomainFile.GetDacPtr();
DomainFile * pDomainAssembly = vmDomainFile.GetDacPtr();

if (pDomainFile == NULL)
if (pDomainAssembly == NULL)
{
ThrowHR(E_FAIL);
}

// Get the underlying module - none of this is AppDomain specific
Module * pModule = pDomainFile->GetModule();
Module * pModule = pDomainAssembly->GetModule();
DWORD dwBits = pModule->GetDebuggerInfoBits();
*pfAllowJITOpts = !CORDisableJITOptimizations(dwBits);
*pfEnableEnC = pModule->IsEditAndContinueEnabled();
Expand Down Expand Up @@ -719,8 +719,8 @@ HRESULT DacDbiInterfaceImpl::SetCompilerFlags(VMPTR_DomainFile vmDomainFile,
DD_ENTER_MAY_THROW;

DWORD dwBits = 0;
DomainFile * pDomainFile = vmDomainFile.GetDacPtr();
Module * pModule = pDomainFile->GetModule();
DomainFile * pDomainAssembly = vmDomainFile.GetDacPtr();
Module * pModule = pDomainAssembly->GetModule();
HRESULT hr = S_OK;


Expand Down Expand Up @@ -1089,8 +1089,8 @@ void DacDbiInterfaceImpl::GetILCodeAndSig(VMPTR_DomainFile vmDomainFile,
{
DD_ENTER_MAY_THROW;

DomainFile * pDomainFile = vmDomainFile.GetDacPtr();
Module * pModule = pDomainFile->GetModule();
DomainFile * pDomainAssembly = vmDomainFile.GetDacPtr();
Module * pModule = pDomainAssembly->GetModule();
RVA methodRVA = 0;
DWORD implFlags;

Expand Down Expand Up @@ -1334,8 +1334,8 @@ void DacDbiInterfaceImpl::GetNativeCodeInfo(VMPTR_DomainFile vmDomainFil
// pre-initialize:
pCodeInfo->Clear();

DomainFile * pDomainFile = vmDomainFile.GetDacPtr();
Module * pModule = pDomainFile->GetModule();
DomainFile * pDomainAssembly = vmDomainFile.GetDacPtr();
Module * pModule = pDomainAssembly->GetModule();

MethodDesc* pMethodDesc = FindLoadedMethodRefOrDef(pModule, functionToken);
pCodeInfo->vmNativeCodeMethodDescToken.SetHostPtr(pMethodDesc);
Expand Down Expand Up @@ -1768,9 +1768,9 @@ void DacDbiInterfaceImpl::GetInstantiationFieldInfo (VMPTR_DomainFile
{
DD_ENTER_MAY_THROW;

DomainFile * pDomainFile = vmDomainFile.GetDacPtr();
_ASSERTE(pDomainFile != NULL);
AppDomain * pAppDomain = pDomainFile->GetAppDomain();
DomainFile * pDomainAssembly = vmDomainFile.GetDacPtr();
_ASSERTE(pDomainAssembly != NULL);
AppDomain * pAppDomain = pDomainAssembly->GetAppDomain();
TypeHandle thExact;
TypeHandle thApprox;

Expand Down Expand Up @@ -2503,7 +2503,7 @@ void DacDbiInterfaceImpl::GetClassTypeInfo(TypeHandle typeH
pTypeInfo->ClassTypeData.vmModule.SetDacTargetPtr(PTR_HOST_TO_TADDR(pModule));
if (pAppDomain)
{
pTypeInfo->ClassTypeData.vmDomainFile.SetDacTargetPtr(PTR_HOST_TO_TADDR(pModule->GetDomainFile()));
pTypeInfo->ClassTypeData.vmDomainFile.SetDacTargetPtr(PTR_HOST_TO_TADDR(pModule->GetDomainAssembly()));
}
else
{
Expand Down Expand Up @@ -2590,7 +2590,7 @@ void DacDbiInterfaceImpl::TypeHandleToBasicTypeInfo(TypeHandle
pTypeInfo->vmModule.SetDacTargetPtr(PTR_HOST_TO_TADDR(pModule));
if (pAppDomain)
{
pTypeInfo->vmDomainFile.SetDacTargetPtr(PTR_HOST_TO_TADDR(pModule->GetDomainFile()));
pTypeInfo->vmDomainFile.SetDacTargetPtr(PTR_HOST_TO_TADDR(pModule->GetDomainAssembly()));
}
else
{
Expand Down Expand Up @@ -2889,8 +2889,8 @@ TypeHandle DacDbiInterfaceImpl::GetClassOrValueTypeHandle(DebuggerIPCE_BasicType
// otherwise, have the loader look it up using the metadata token and domain file
else
{
DomainFile * pDomainFile = pData->vmDomainFile.GetDacPtr();
Module * pModule = pDomainFile->GetModule();
DomainFile * pDomainAssembly = pData->vmDomainFile.GetDacPtr();
Module * pModule = pDomainAssembly->GetModule();

typeHandle = ClassLoader::LookupTypeDefOrRefInModule(pModule, pData->metadataToken);
if (typeHandle.IsNull())
Expand Down Expand Up @@ -3322,7 +3322,7 @@ void DacDbiInterfaceImpl::GetSimpleType(VMPTR_AppDomain vmAppDomain,

if (pAppDomain)
{
pVmDomainFile->SetHostPtr(pModule->GetDomainFile());
pVmDomainFile->SetHostPtr(pModule->GetDomainAssembly());
if (pVmDomainFile->IsNull())
ThrowHR(CORDBG_E_TARGET_INCONSISTENT);
}
Expand Down Expand Up @@ -3514,7 +3514,7 @@ HRESULT DacDbiInterfaceImpl::GetDelegateFunctionData(
if (hr != S_OK)
return hr;

ppFunctionDomainFile->SetDacTargetPtr(dac_cast<TADDR>(pMD.GetDacPtr()->GetModule()->GetDomainFile()));
ppFunctionDomainFile->SetDacTargetPtr(dac_cast<TADDR>(pMD.GetDacPtr()->GetModule()->GetDomainAssembly()));
*pMethodDef = pMD.GetDacPtr()->GetMemberDef();

return hr;
Expand Down Expand Up @@ -3725,17 +3725,17 @@ void DacDbiInterfaceImpl::GetStackFramesFromException(VMPTR_Object vmObject, Dac
BaseDomain* pBaseDomain = currentElement.pFunc->GetAssembly()->GetDomain();

AppDomain* pDomain = NULL;
DomainFile* pDomainFile = NULL;
DomainFile* pDomainAssembly = NULL;

pDomain = pBaseDomain->AsAppDomain();

_ASSERTE(pDomain != NULL);

pDomainFile = pModule->GetDomainFile();
_ASSERTE(pDomainFile != NULL);
pDomainAssembly = pModule->GetDomainAssembly();
_ASSERTE(pDomainAssembly != NULL);

currentFrame.vmAppDomain.SetHostPtr(pDomain);
currentFrame.vmDomainFile.SetHostPtr(pDomainFile);
currentFrame.vmDomainFile.SetHostPtr(pDomainAssembly);
currentFrame.ip = currentElement.ip;
currentFrame.methodDef = currentElement.pFunc->GetMemberDef();
currentFrame.isLastForeignExceptionFrame = (currentElement.flags & STEF_LAST_FRAME_FROM_FOREIGN_STACK_TRACE) != 0;
Expand Down Expand Up @@ -3879,8 +3879,8 @@ FieldDesc * DacDbiInterfaceImpl::GetEnCFieldDesc(const EnCHangingFieldInfo * pEn
{
FieldDesc * pFD = NULL;

DomainFile * pDomainFile = pEnCFieldInfo->GetObjectTypeData().vmDomainFile.GetDacPtr();
Module * pModule = pDomainFile->GetModule();
DomainFile * pDomainAssembly = pEnCFieldInfo->GetObjectTypeData().vmDomainFile.GetDacPtr();
Module * pModule = pDomainAssembly->GetModule();

// get the type handle for the object
TypeHandle typeHandle = ClassLoader::LookupTypeDefOrRefInModule(pModule,
Expand Down Expand Up @@ -3918,8 +3918,8 @@ PTR_CBYTE DacDbiInterfaceImpl::GetPtrToEnCField(FieldDesc * pFD, const EnCHangin
#else

PTR_EditAndContinueModule pEnCModule;
DomainFile * pDomainFile = pEnCFieldInfo->GetObjectTypeData().vmDomainFile.GetDacPtr();
Module * pModule = pDomainFile->GetModule();
DomainFile * pDomainAssembly = pEnCFieldInfo->GetObjectTypeData().vmDomainFile.GetDacPtr();
Module * pModule = pDomainAssembly->GetModule();

// make sure we actually have an EditAndContinueModule
_ASSERTE(pModule->IsEditAndContinueCapable());
Expand Down Expand Up @@ -4090,8 +4090,8 @@ void DacDbiInterfaceImpl::ResolveTypeReference(const TypeRefData * pTypeRefInfo,
TypeRefData * pTargetRefInfo)
{
DD_ENTER_MAY_THROW;
DomainFile * pDomainFile = pTypeRefInfo->vmDomainFile.GetDacPtr();
Module * pReferencingModule = pDomainFile->GetModule();
DomainFile * pDomainAssembly = pTypeRefInfo->vmDomainFile.GetDacPtr();
Module * pReferencingModule = pDomainAssembly->GetModule();
BOOL fSuccess = FALSE;

// Resolve the type ref
Expand All @@ -4117,9 +4117,9 @@ void DacDbiInterfaceImpl::ResolveTypeReference(const TypeRefData * pTypeRefInfo,
_ASSERTE(pTargetModule != NULL);
_ASSERTE( TypeFromToken(targetTypeDef) == mdtTypeDef );

AppDomain * pAppDomain = pDomainFile->GetAppDomain();
AppDomain * pAppDomain = pDomainAssembly->GetAppDomain();

pTargetRefInfo->vmDomainFile.SetDacTargetPtr(PTR_HOST_TO_TADDR(pTargetModule->GetDomainFile()));
pTargetRefInfo->vmDomainFile.SetDacTargetPtr(PTR_HOST_TO_TADDR(pTargetModule->GetDomainAssembly()));
pTargetRefInfo->typeToken = targetTypeDef;
}
else
Expand Down Expand Up @@ -4353,8 +4353,8 @@ void DacDbiInterfaceImpl::GetModuleForDomainFile(VMPTR_DomainFile vmDomainFile,

_ASSERTE(pModule != NULL);

DomainFile * pDomainFile = vmDomainFile.GetDacPtr();
pModule->SetHostPtr(pDomainFile->GetModule());
DomainFile * pDomainAssembly = vmDomainFile.GetDacPtr();
pModule->SetHostPtr(pDomainAssembly->GetModule());
}


Expand All @@ -4367,12 +4367,12 @@ void DacDbiInterfaceImpl::GetDomainFileData(VMPTR_DomainFile vmDomainFile, Domai

ZeroMemory(pData, sizeof(*pData));

DomainFile * pDomainFile = vmDomainFile.GetDacPtr();
AppDomain * pAppDomain = pDomainFile->GetAppDomain();
DomainFile * pDomainAssembly = vmDomainFile.GetDacPtr();
AppDomain * pAppDomain = pDomainAssembly->GetAppDomain();

// @dbgtodo - is this efficient DAC usage (perhaps a dac-cop rule)? Are we round-tripping the pointer?
// Should we have a GetDomainAssembly() that returns a PTR_DomainAssembly?
pData->vmDomainAssembly.SetHostPtr(pDomainFile->GetDomainAssembly());
pData->vmDomainAssembly.SetHostPtr(pDomainAssembly->GetDomainAssembly());
pData->vmAppDomain.SetHostPtr(pAppDomain);
}

Expand Down Expand Up @@ -4515,9 +4515,9 @@ VMPTR_DomainAssembly DacDbiInterfaceImpl::ResolveAssembly(
DD_ENTER_MAY_THROW;


DomainFile * pDomainFile = vmScope.GetDacPtr();
AppDomain * pAppDomain = pDomainFile->GetAppDomain();
Module * pModule = pDomainFile->GetModule();
DomainFile * pDomainAssembly = vmScope.GetDacPtr();
AppDomain * pAppDomain = pDomainAssembly->GetAppDomain();
Module * pModule = pDomainAssembly->GetModule();

VMPTR_DomainAssembly vmDomainAssembly = VMPTR_DomainAssembly::NullPtr();

Expand Down Expand Up @@ -7014,7 +7014,7 @@ bool DacDbiInterfaceImpl::IsValidObject(CORDB_ADDRESS addr)
}

bool DacDbiInterfaceImpl::GetAppDomainForObject(CORDB_ADDRESS addr, OUT VMPTR_AppDomain * pAppDomain,
OUT VMPTR_Module *pModule, OUT VMPTR_DomainFile *pDomainFile)
OUT VMPTR_Module *pModule, OUT VMPTR_DomainFile *pDomainAssembly)
{
DD_ENTER_MAY_THROW;

Expand All @@ -7034,7 +7034,7 @@ bool DacDbiInterfaceImpl::GetAppDomainForObject(CORDB_ADDRESS addr, OUT VMPTR_Ap
{
pAppDomain->SetDacTargetPtr(PTR_HOST_TO_TADDR(baseDomain->AsAppDomain()));
pModule->SetDacTargetPtr(PTR_HOST_TO_TADDR(module));
pDomainFile->SetDacTargetPtr(PTR_HOST_TO_TADDR(module->GetDomainFile()));
pDomainAssembly->SetDacTargetPtr(PTR_HOST_TO_TADDR(module->GetDomainAssembly()));
}
else
{
Expand Down
14 changes: 7 additions & 7 deletions src/coreclr/debug/daccess/dacdbiimplstackwalk.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,7 @@ void DacDbiInterfaceImpl::EnumerateInternalFrames(VMPTR_Thread
#endif // FEATURE_COMINTEROP

Module * pModule = (pMD ? pMD->GetModule() : NULL);
DomainFile * pDomainFile = (pModule ? pModule->GetDomainFile() : NULL);
DomainFile * pDomainAssembly = (pModule ? pModule->GetDomainAssembly() : NULL);

if (frameData.stubFrame.frameType == STUBFRAME_FUNC_EVAL)
{
Expand All @@ -523,13 +523,13 @@ void DacDbiInterfaceImpl::EnumerateInternalFrames(VMPTR_Thread

frameData.stubFrame.funcMetadataToken = pDE->m_methodToken;
frameData.stubFrame.vmDomainFile.SetHostPtr(
pDE->m_debuggerModule ? pDE->m_debuggerModule->GetDomainFile() : NULL);
pDE->m_debuggerModule ? pDE->m_debuggerModule->GetDomainAssembly() : NULL);
frameData.stubFrame.vmMethodDesc = VMPTR_MethodDesc::NullPtr();
}
else
{
frameData.stubFrame.funcMetadataToken = (pMD == NULL ? NULL : pMD->GetMemberDef());
frameData.stubFrame.vmDomainFile.SetHostPtr(pDomainFile);
frameData.stubFrame.vmDomainFile.SetHostPtr(pDomainAssembly);
frameData.stubFrame.vmMethodDesc.SetHostPtr(pMD);
}

Expand Down Expand Up @@ -702,11 +702,11 @@ void DacDbiInterfaceImpl::InitFrameData(StackFrameIterator * pIter,
// Although MiniDumpNormal tries to dump all AppDomains, it's possible
// target corruption will keep one from being present. This should mean
// we'll just fail later, but struggle on for now.
DomainFile *pDomainFile = NULL;
DomainFile *pDomainAssembly = NULL;
EX_TRY_ALLOW_DATATARGET_MISSING_MEMORY
{
pDomainFile = (pModule ? pModule->GetDomainFile() : NULL);
_ASSERTE(pDomainFile != NULL);
pDomainAssembly = (pModule ? pModule->GetDomainAssembly() : NULL);
_ASSERTE(pDomainAssembly != NULL);
}
EX_END_CATCH_ALLOW_DATATARGET_MISSING_MEMORY

Expand Down Expand Up @@ -783,7 +783,7 @@ void DacDbiInterfaceImpl::InitFrameData(StackFrameIterator * pIter,
//

pFuncData->funcMetadataToken = pMD->GetMemberDef();
pFuncData->vmDomainFile.SetHostPtr(pDomainFile);
pFuncData->vmDomainFile.SetHostPtr(pDomainAssembly);

// PERF: this is expensive to get so I stopped fetching it eagerly
// It is only needed if we haven't already got a cached copy
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/debug/di/rspriv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4806,7 +4806,7 @@ class CordbType : public CordbBase, public ICorDebugType, public ICorDebugType2
void DestNaryType(Instantiation *pInst);

CorElementType GetElementType() { return m_elementType; }
VMPTR_DomainFile GetDomainFile();
VMPTR_DomainFile GetDomainAssembly();
VMPTR_Module GetModule();

// If this is a ptr type, get the CordbType that it points to.
Expand Down
6 changes: 3 additions & 3 deletions src/coreclr/debug/di/rstype.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1876,7 +1876,7 @@ CordbType::GetUnboxedObjectSize(ULONG32 *pObjectSize)
}
}

VMPTR_DomainFile CordbType::GetDomainFile()
VMPTR_DomainFile CordbType::GetDomainAssembly()
{
if (m_pClass != NULL)
{
Expand Down Expand Up @@ -1950,7 +1950,7 @@ HRESULT CordbType::TypeToBasicTypeData(DebuggerIPCE_BasicTypeData *data)
_ASSERTE(m_pClass != NULL);
data->elementType = m_pClass->IsValueClassNoInit() ? ELEMENT_TYPE_VALUETYPE : ELEMENT_TYPE_CLASS;
data->metadataToken = m_pClass->MDToken();
data->vmDomainFile = GetDomainFile();
data->vmDomainFile = GetDomainAssembly();
data->vmTypeHandle = m_typeHandleExact;
if (m_pClass->HasTypeParams() && data->vmTypeHandle.IsNull())
{
Expand Down Expand Up @@ -2001,7 +2001,7 @@ void CordbType::TypeToExpandedTypeData(DebuggerIPCE_ExpandedTypeData *data)
{
data->elementType = m_pClass->IsValueClassNoInit() ? ELEMENT_TYPE_VALUETYPE : ELEMENT_TYPE_CLASS;
data->ClassTypeData.metadataToken = m_pClass->GetToken();
data->ClassTypeData.vmDomainFile = GetDomainFile();
data->ClassTypeData.vmDomainFile = GetDomainAssembly();
data->ClassTypeData.vmModule = GetModule();
data->ClassTypeData.typeHandle = VMPTR_TypeHandle::NullPtr();

Expand Down
Loading