Skip to content

[release/6.0-rc2] Undo breaking change compat in GetMethodNativeMap #59231

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 2 commits into from
Sep 20, 2021
Merged

[release/6.0-rc2] Undo breaking change compat in GetMethodNativeMap #59231

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5fd51e4
Undo breaking change compat
hoyosjs Sep 14, 2021
3a8ada5
Fix compilation
hoyosjs Sep 14, 2021
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
34 changes: 24 additions & 10 deletions src/coreclr/debug/daccess/daccess.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6077,13 +6077,20 @@ ClrDataAccess::GetMethodVarInfo(MethodDesc* methodDesc,
SUPPORTS_DAC;
COUNT_T countNativeVarInfo;
NewHolder<ICorDebugInfo::NativeVarInfo> nativeVars(NULL);

NativeCodeVersion requestedNativeCodeVersion = ExecutionManager::GetNativeCodeVersion(address);
if (requestedNativeCodeVersion.IsNull() || requestedNativeCodeVersion.GetNativeCode() == NULL)
TADDR nativeCodeStartAddr;
if (address != NULL)
{
return E_INVALIDARG;
NativeCodeVersion requestedNativeCodeVersion = ExecutionManager::GetNativeCodeVersion(address);
if (requestedNativeCodeVersion.IsNull() || requestedNativeCodeVersion.GetNativeCode() == NULL)
{
return E_INVALIDARG;
}
nativeCodeStartAddr = PCODEToPINSTR(requestedNativeCodeVersion.GetNativeCode());
}
else
{
nativeCodeStartAddr = PCODEToPINSTR(methodDesc->GetNativeCode());
}
TADDR nativeCodeStartAddr = PCODEToPINSTR(requestedNativeCodeVersion.GetNativeCode());

DebugInfoRequest request;
request.InitFromStartingAddr(methodDesc, nativeCodeStartAddr);
Expand Down Expand Up @@ -6128,13 +6135,20 @@ ClrDataAccess::GetMethodNativeMap(MethodDesc* methodDesc,

// Use the DebugInfoStore to get IL->Native maps.
// It doesn't matter whether we're jitted, ngenned etc.

NativeCodeVersion requestedNativeCodeVersion = ExecutionManager::GetNativeCodeVersion(address);
if (requestedNativeCodeVersion.IsNull() || requestedNativeCodeVersion.GetNativeCode() == NULL)
TADDR nativeCodeStartAddr;
if (address != NULL)
{
return E_INVALIDARG;
NativeCodeVersion requestedNativeCodeVersion = ExecutionManager::GetNativeCodeVersion(address);
if (requestedNativeCodeVersion.IsNull() || requestedNativeCodeVersion.GetNativeCode() == NULL)
{
return E_INVALIDARG;
}
nativeCodeStartAddr = PCODEToPINSTR(requestedNativeCodeVersion.GetNativeCode());
}
else
{
nativeCodeStartAddr = PCODEToPINSTR(methodDesc->GetNativeCode());
}
TADDR nativeCodeStartAddr = PCODEToPINSTR(requestedNativeCodeVersion.GetNativeCode());

DebugInfoRequest request;
request.InitFromStartingAddr(methodDesc, nativeCodeStartAddr);
Expand Down