Skip to content

Fix the amd64 cross-DAC stack unwinding #114836

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 6 commits into from
Apr 23, 2025
Merged

Fix the amd64 cross-DAC stack unwinding #114836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c2638fc
Move m_Context to the end of SoftwareExceptionFrame to fix cross-DAC
mikem8361 Apr 19, 2025
ce3ac73
Add comments and fix FaultingExceptionFrame on amd64
mikem8361 Apr 21, 2025
376d5ac
Fix debug assert in DBI
mikem8361 Apr 22, 2025
58416d2
Back out FaultingExceptionFrame changes
mikem8361 Apr 21, 2025
eddff5a
Merge branch 'main' into fix_cross_dac
mikem8361 Apr 22, 2025
aa9ba7e
Merge branch 'main' into fix_cross_dac
mikem8361 Apr 23, 2025
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
7 changes: 7 additions & 0 deletions src/coreclr/debug/ee/debugger.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2774,6 +2774,13 @@ DebuggerMethodInfo *Debugger::GetOrCreateMethodInfo(Module *pModule, mdMethodDef
}
CONTRACTL_END;

#ifdef DACCESS_COMPILE
if (!HasLazyData())
{
return NULL;
}
#endif // #ifdef DACCESS_COMPILE

DebuggerMethodInfo *info = NULL;

// When dump debugging, we don't expect to have a lock,
Expand Down
4 changes: 3 additions & 1 deletion src/coreclr/vm/frames.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1041,8 +1041,10 @@ typedef DPTR(class SoftwareExceptionFrame) PTR_SoftwareExceptionFrame;
class SoftwareExceptionFrame : public Frame
{
TADDR m_ReturnAddress;
T_CONTEXT m_Context;
T_KNONVOLATILE_CONTEXT_POINTERS m_ContextPointers;
// This T_CONTEXT field needs to be the last field in the class because it is a
// different size between Linux (pal.h) and the Windows cross-DAC (winnt.h).
T_CONTEXT m_Context;

public:
#ifndef DACCESS_COMPILE
Expand Down
Loading