Skip to content
This repository has been archived by the owner on Feb 2, 2023. It is now read-only.
/ jdk13u-dev Public archive

8256359: AArch64: runtime/ReservedStack/ReservedStackTestCompiler.java fails #186

Closed
wants to merge 1 commit into from
Closed

8256359: AArch64: runtime/ReservedStack/ReservedStackTestCompiler.java fails #186

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 7 additions & 2 deletions src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,14 +654,16 @@ void InterpreterMacroAssembler::remove_activation(

// remove activation
// get sender esp
ldr(esp,
ldr(rscratch2,
Address(rfp, frame::interpreter_frame_sender_sp_offset * wordSize));
if (StackReservedPages > 0) {
// testing if reserved zone needs to be re-enabled
Label no_reserved_zone_enabling;

// look for an overflow into the stack reserved zone, i.e.
// interpreter_frame_sender_sp <= JavaThread::reserved_stack_activation
ldr(rscratch1, Address(rthread, JavaThread::reserved_stack_activation_offset()));
cmp(esp, rscratch1);
cmp(rscratch2, rscratch1);
br(Assembler::LS, no_reserved_zone_enabling);

call_VM_leaf(
Expand All @@ -672,6 +674,9 @@ void InterpreterMacroAssembler::remove_activation(

bind(no_reserved_zone_enabling);
}

// restore sender esp
mov(esp, rscratch2);
// remove frame anchor
leave();
// If we're returning to interpreted code we will shortly be
Expand Down