Skip to content

Make DAC return Module instead of PEAssembly for DacpModuleData::PEAssembly #103821

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
merged 1 commit into from
Jun 24, 2024
Merged

Make DAC return Module instead of PEAssembly for DacpModuleData::PEAssembly #103821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/coreclr/debug/daccess/dacimpl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1088,8 +1088,8 @@ class ClrDataAccess
virtual HRESULT STDMETHODCALLTYPE GetModuleData(CLRDATA_ADDRESS moduleAddr, struct DacpModuleData *data);
virtual HRESULT STDMETHODCALLTYPE TraverseModuleMap(ModuleMapType mmt, CLRDATA_ADDRESS moduleAddr, MODULEMAPTRAVERSE pCallback, LPVOID token);
virtual HRESULT STDMETHODCALLTYPE GetMethodDescFromToken(CLRDATA_ADDRESS moduleAddr, mdToken token, CLRDATA_ADDRESS *methodDesc);
virtual HRESULT STDMETHODCALLTYPE GetPEFileBase(CLRDATA_ADDRESS addr, CLRDATA_ADDRESS *base);
virtual HRESULT STDMETHODCALLTYPE GetPEFileName(CLRDATA_ADDRESS addr, unsigned int count, _Inout_updates_z_(count) WCHAR *fileName, unsigned int *pNeeded);
virtual HRESULT STDMETHODCALLTYPE GetPEFileBase(CLRDATA_ADDRESS moduleAddr, CLRDATA_ADDRESS *base);
virtual HRESULT STDMETHODCALLTYPE GetPEFileName(CLRDATA_ADDRESS moduleAddr, unsigned int count, _Inout_updates_z_(count) WCHAR *fileName, unsigned int *pNeeded);
virtual HRESULT STDMETHODCALLTYPE GetAssemblyModuleList(CLRDATA_ADDRESS assembly, unsigned int count, CLRDATA_ADDRESS modules[], unsigned int *pNeeded);
virtual HRESULT STDMETHODCALLTYPE GetGCHeapData(struct DacpGcHeapData *data);
virtual HRESULT STDMETHODCALLTYPE GetGCHeapList(unsigned int count, CLRDATA_ADDRESS heaps[], unsigned int *pNeeded);
Expand Down
24 changes: 15 additions & 9 deletions src/coreclr/debug/daccess/request.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1722,11 +1722,11 @@ ClrDataAccess::GetModuleData(CLRDATA_ADDRESS addr, struct DacpModuleData *Module

ZeroMemory(ModuleData,sizeof(DacpModuleData));
ModuleData->Address = addr;
ModuleData->PEAssembly = HOST_CDADDR(pModule->GetPEAssembly());
ModuleData->PEAssembly = addr; // Module address in .NET 9+ - correspondingly, SOS-DAC APIs for PE assemblies expect a module address
COUNT_T metadataSize = 0;
if (!pModule->GetPEAssembly()->IsDynamic())
{
ModuleData->ilBase = (CLRDATA_ADDRESS)(ULONG_PTR) pModule->GetPEAssembly()->GetIJWBase();
ModuleData->ilBase = TO_CDADDR(dac_cast<TADDR>(pModule->GetPEAssembly()->GetLoadedLayout()->GetBase()));
}

ModuleData->metadataStart = (CLRDATA_ADDRESS)dac_cast<TADDR>(pModule->GetPEAssembly()->GetLoadedMetadata(&metadataSize));
Expand Down Expand Up @@ -2125,13 +2125,14 @@ ClrDataAccess::GetFrameName(CLRDATA_ADDRESS vtable, unsigned int count, _Inout_u
}

HRESULT
ClrDataAccess::GetPEFileName(CLRDATA_ADDRESS addr, unsigned int count, _Inout_updates_z_(count) WCHAR *fileName, unsigned int *pNeeded)
ClrDataAccess::GetPEFileName(CLRDATA_ADDRESS moduleAddr, unsigned int count, _Inout_updates_z_(count) WCHAR *fileName, unsigned int *pNeeded)
{
if (addr == 0 || (fileName == NULL && pNeeded == NULL) || (fileName != NULL && count == 0))
if (moduleAddr == 0 || (fileName == NULL && pNeeded == NULL) || (fileName != NULL && count == 0))
return E_INVALIDARG;

SOSDacEnter();
PEAssembly* pPEAssembly = PTR_PEAssembly(TO_TADDR(addr));
PTR_Module pModule = PTR_Module(TO_TADDR(moduleAddr));
PEAssembly* pPEAssembly = pModule->GetPEAssembly();

// Turn from bytes to wide characters
if (!pPEAssembly->GetPath().IsEmpty())
Expand Down Expand Up @@ -2182,20 +2183,25 @@ ClrDataAccess::GetPEFileName(CLRDATA_ADDRESS addr, unsigned int count, _Inout_up
}

HRESULT
ClrDataAccess::GetPEFileBase(CLRDATA_ADDRESS addr, CLRDATA_ADDRESS *base)
ClrDataAccess::GetPEFileBase(CLRDATA_ADDRESS moduleAddr, CLRDATA_ADDRESS *base)
{
if (addr == 0 || base == NULL)
if (moduleAddr == 0 || base == NULL)
return E_INVALIDARG;

SOSDacEnter();

PEAssembly* pPEAssembly = PTR_PEAssembly(TO_TADDR(addr));
PTR_Module pModule = PTR_Module(TO_TADDR(moduleAddr));
PEAssembly* pPEAssembly = pModule->GetPEAssembly();

// More fields later?
if (!pPEAssembly->IsDynamic())
*base = TO_CDADDR(pPEAssembly->GetIJWBase());
{
*base = TO_CDADDR(dac_cast<TADDR>(pPEAssembly->GetLoadedLayout()->GetBase()));
}
else
{
*base = (CLRDATA_ADDRESS)NULL;
}

SOSDacLeave();
return hr;
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/debug/daccess/task.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2705,7 +2705,7 @@ ClrDataModule::RequestGetModuleData(
Module* pModule = GetModule();
PEAssembly *pPEAssembly = pModule->GetPEAssembly();

outGMD->PEAssembly = TO_CDADDR(PTR_HOST_TO_TADDR(pPEAssembly));
outGMD->PEAssembly = TO_CDADDR(PTR_HOST_TO_TADDR(pModule));
outGMD->IsDynamic = pModule->IsReflection();

if (pPEAssembly != NULL)
Expand Down
4 changes: 2 additions & 2 deletions src/coreclr/inc/dacprivate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ struct MSLAYOUT DacpThreadLocalModuleData
struct MSLAYOUT DacpModuleData
{
CLRDATA_ADDRESS Address = 0;
CLRDATA_ADDRESS PEAssembly = 0; // A PEAssembly addr
CLRDATA_ADDRESS PEAssembly = 0; // Actually the module address in .NET 9+
CLRDATA_ADDRESS ilBase = 0;
CLRDATA_ADDRESS metadataStart = 0;
ULONG64 metadataSize = 0;
Expand Down Expand Up @@ -986,7 +986,7 @@ struct MSLAYOUT DacpGetModuleData
BOOL IsDynamic = FALSE;
BOOL IsInMemory = FALSE;
BOOL IsFileLayout = FALSE;
CLRDATA_ADDRESS PEAssembly = 0;
CLRDATA_ADDRESS PEAssembly = 0; // Actually the module address in .NET 9+
CLRDATA_ADDRESS LoadedPEAddress = 0;
ULONG64 LoadedPESize = 0;
CLRDATA_ADDRESS InMemoryPdbAddress = 0;
Expand Down
Loading