Skip to content

[interp] Fix doubled interpreter frames in DAC/DBI stack walks #126953

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
kotlarmilos wants to merge 5 commits into
base: main
Choose a base branch
from
+19 −1
Open

[interp] Fix doubled interpreter frames in DAC/DBI stack walks #126953

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
123c90a
Fix interpreter stack walking: double frames and line number off-by-one
kotlarmilos Apr 13, 2026
beab360
Proper fix of the doubled stack trace issue
janvorli Apr 16, 2026
e593141
Revert interpreter IP adjustment in VirtualUnwindInterpreterCallFrame
kotlarmilos Apr 22, 2026
9f219da
Address review: handle interpreted CONTEXT in ResetRegDisp
kotlarmilos Apr 28, 2026
e781d99
Use first-arg register to locate owning InterpreterFrame
kotlarmilos Apr 28, 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
20 changes: 19 additions & 1 deletion src/coreclr/vm/stackwalk.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ PTR_VOID ConvertStackMarkToPointerOnOSStack(PTR_Thread pThread, PTR_VOID stackMa
}
pCurrent = pCurrent->pParent;
} while (pCurrent != NULL);

}

pFrame = pFrame->PtrNextFrame();
Expand Down Expand Up @@ -1087,6 +1087,9 @@ BOOL StackFrameIterator::Init(Thread * pThread,

// process the REGDISPLAY and stop at the first frame
ProcessIp(GetControlPC(m_crawl.pRD));
#ifdef FEATURE_INTERPRETER
_ASSERTE(!m_crawl.codeInfo.IsInterpretedCode());
#endif // FEATURE_INTERPRETER
if (m_crawl.isFrameless && !!(m_crawl.pRD->pCurrentContext->ContextFlags & CONTEXT_EXCEPTION_ACTIVE))
{
m_crawl.hasFaulted = true;
Expand Down Expand Up @@ -1160,6 +1163,21 @@ BOOL StackFrameIterator::ResetRegDisp(PREGDISPLAY pRegDisp,
PCODE curPc = GetControlPC(pRegDisp);
ProcessIp(curPc);

#ifdef FEATURE_INTERPRETER
if (m_crawl.codeInfo.IsInterpretedCode())
{
// The CONTEXT carries the owning InterpreterFrame in the first-arg register
// (set by InterpreterFrame::SetContextToInterpMethodContextFrame). Advance
// m_crawl.pFrame past it so the iterator does not re-enter the same
// InterpMethodContextFrame chain via the explicit frame link.
PTR_InterpreterFrame pOwningInterpFrame =
dac_cast<PTR_InterpreterFrame>((TADDR)GetFirstArgReg(m_crawl.pRD->pCurrentContext));
_ASSERTE(pOwningInterpFrame != NULL);
_ASSERTE(pOwningInterpFrame->GetFrameIdentifier() == FrameIdentifier::InterpreterFrame);
m_crawl.pFrame = pOwningInterpFrame->PtrNextFrame();
}
else
#endif // FEATURE_INTERPRETER
// loop the frame chain to find the closet explicit frame which is lower than the specified REGDISPLAY
// (stack grows up towards lower address)
if (m_crawl.pFrame != FRAME_TOP)
Expand Down
Loading