[cDAC] fix some stack walking bugs.#129916
Open
rcj1 wants to merge 7 commits into
Open
Conversation
Contributor
|
Tagging subscribers to this area: @steveisok, @tommcdon, @dotnet/dotnet-diag |
hoyosjs
approved these changes
Jun 26, 2026
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates the cDAC StackWalk contract implementation to more accurately mirror CoreCLR’s frame semantics, specifically around FuncEvalFrame return address reporting and frame-to-native state transitions.
Changes:
- Add
ReturnAddressto the FuncEvalFrame cDAC data contract and VM data descriptor so it can be read directly fromFuncEvalFrame::m_ReturnAddress. - Update StackWalk frame return-address retrieval for
FuncEvalFrameto use the newFuncEvalFrame.ReturnAddressfield (and keep returning null for non-hijack eval paths). - Adjust
StackWalk_1.UpdateStateso that when already inStackWalkState.Frameand the current context is unmanaged, the walker stays inFramestate (or completes) instead of transitioning toNativeMarker.
Show a summary per file
| File | Description |
|---|---|
| src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Contracts/Data/Frames/FuncEvalFrame.cs | Adds ReturnAddress field to the managed cDAC data model for FuncEvalFrame. |
| src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Contracts/Contracts/StackWalk/StackWalk_1.cs | Fixes state transition logic to avoid incorrect Frame → NativeMarker transitions. |
| src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Contracts/Contracts/StackWalk/FrameHandling/FrameHelpers.cs | Uses FuncEvalFrame.ReturnAddress when computing return address (matching VM layout). |
| src/coreclr/vm/frames.h | Exposes FuncEvalFrame::m_ReturnAddress offset via cdac_data<FuncEvalFrame>. |
| src/coreclr/vm/datadescriptor/datadescriptor.inc | Adds the FuncEvalFrame.ReturnAddress data descriptor field. |
| docs/design/datacontracts/StackWalk.md | Documents the new FuncEvalFrame.ReturnAddress descriptor dependency. |
Copilot's findings
- Files reviewed: 6/6 changed files
- Comments generated: 2
hoyosjs
approved these changes
Jun 26, 2026
noahfalk
approved these changes
Jun 27, 2026
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
hoyosjs
reviewed
Jun 27, 2026
hoyosjs
approved these changes
Jun 27, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Found with internal diagnostics tests.