Skip to content

Commit 6532a80

Browse files
authored
Merge pull request #22303 from ehsankianifar/UpdateSpillRegisters
Add spill registers in walkTransitionFrame()
2 parents e71b293 + 4ab7d0e commit 6532a80

2 files changed

Lines changed: 6 additions & 0 deletions

File tree

debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackwalker/JITStackWalker.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -911,6 +911,9 @@ private FrameCallbackResult walkTransitionFrame(WalkState walkState) throws Corr
911911

912912
if ((walkState.flags & J9_STACKWALK_MAINTAIN_REGISTER_MAP) != 0) {
913913
CLEAR_LOCAL_REGISTER_MAP_ENTRIES(walkState);
914+
if (!inMethodPrologue) {
915+
jitAddSpilledRegisters(walkState, VoidPointer.NULL);
916+
}
914917
}
915918

916919
UNWIND_TO_NEXT_FRAME(walkState);

runtime/codert_vm/jswalk.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -417,6 +417,9 @@ static UDATA walkTransitionFrame(J9StackWalkState *walkState)
417417

418418
if (walkState->flags & J9_STACKWALK_MAINTAIN_REGISTER_MAP) {
419419
CLEAR_LOCAL_REGISTER_MAP_ENTRIES(walkState);
420+
if (!inMethodPrologue) {
421+
jitAddSpilledRegisters(walkState, walkState->stackMap);
422+
}
420423
}
421424

422425
UNWIND_TO_NEXT_FRAME(walkState);

0 commit comments

Comments
 (0)