Skip to content

Commit e2bd63b

Browse files
authored
Include the frame register when copying arm32 debugger stackwalk contexts (#116663)
1 parent ec11903 commit e2bd63b

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/coreclr/debug/daccess/dacdbiimpl.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5647,8 +5647,9 @@ void DacDbiInterfaceImpl::GetContext(VMPTR_Thread vmThread, DT_CONTEXT * pContex
56475647
UpdateContextFromRegDisp(&tmpRd, &tmpContext);
56485648
CopyMemory(pContextBuffer, &tmpContext, sizeof(*pContextBuffer));
56495649
pContextBuffer->ContextFlags = DT_CONTEXT_CONTROL
5650-
#ifdef TARGET_AMD64
5651-
| DT_CONTEXT_INTEGER // On AMD64, we also need to save RBP for stackwalking
5650+
#if defined(TARGET_AMD64) || defined(TARGET_ARM)
5651+
| DT_CONTEXT_INTEGER // DT_CONTEXT_INTEGER is needed to include the frame register on ARM32 and AMD64 architectures
5652+
// DT_CONTEXT_CONTROL already includes the frame register for X86 and ARM64 architectures
56525653
#endif
56535654
;
56545655
return;

0 commit comments

Comments
 (0)