Skip to content

Fix x86 runtime async frame pointer mismatch in GetSpForDiagnosticReporting #126717

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

Open
tommcdon wants to merge 3 commits into
base: main
Choose a base branch
from
+26 −5
Open

Fix x86 runtime async frame pointer mismatch in GetSpForDiagnosticReporting #126717

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
909edec
Fix x86 runtime async frame pointer mismatch in GetSpForDiagnosticRep…
tommcdon Apr 9, 2026
b6c4525
Revert "Fix x86 runtime async frame pointer mismatch in GetSpForDiagn…
tommcdon Apr 11, 2026
a806213
Fix x86 FindFrame mismatch for methods with stack parameters
tommcdon Apr 11, 2026
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
31 changes: 26 additions & 5 deletions src/coreclr/debug/di/rsthread.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1412,13 +1412,13 @@ HRESULT CordbThread::FindFrame(ICorDebugFrame ** ppFrame, FramePointer fp)
ICorDebugFrame * pIFrame = pSSW->GetFrame(i);
CordbFrame * pCFrame = CordbFrame::GetCordbFrameFromInterface(pIFrame);

#if defined(HOST_64BIT)
// On 64-bit we can simply compare the FramePointer.
#if !defined(TARGET_X86)
// Compare the FramePointer to determine if the frame matches
if (pCFrame->GetFramePointer() == fp)
#else // !HOST_64BIT
// On other platforms, we need to do a more elaborate check.
#else
// On x86 we need to do a more elaborate check. The reason is that on x86, the FramePointer is always the same as the value of EBP, so we can just check if the input FramePointer is contained in the frame. However, on other platforms, the FramePointer may not be the same as the value of RSP, so we need to check if the input FramePointer is the same as the one of the frame.
if (pCFrame->IsContainedInFrame(fp))
#endif // HOST_64BIT
#endif
{
*ppFrame = pIFrame;
(*ppFrame)->AddRef();
Expand Down Expand Up @@ -4773,6 +4773,27 @@ bool CordbFrame::IsContainedInFrame(FramePointer fp)

CORDB_ADDRESS sp = PTR_TO_CORDB_ADDRESS(fp.GetSPValue());

#if defined(TARGET_X86)
// On x86, the runtime sends CallerSP - sizeof(TADDR) as the frame pointer
// for exception notifications (see GetSpForDiagnosticReporting). Since this
// does not account for the stack parameter size, we adjust for it here.
if (sp > stackEnd)
{
CordbNativeFrame * pNativeFrame = GetAsNativeFrame();
if (pNativeFrame != NULL)
{
CORDB_ADDRESS codeAddr = pNativeFrame->GetNativeCode()->GetAddress();
ULONG32 stackParamSize = 0;
IDacDbiInterface * pDAC = GetProcess()->GetDAC();
if (SUCCEEDED(pDAC->GetStackParameterSize(codeAddr + m_ip, &stackParamSize))
&& stackParamSize > 0)
{
sp -= stackParamSize;
}
}
}
#endif // TARGET_X86

if ((stackStart <= sp) && (sp <= stackEnd))
{
return true;
Expand Down
Loading