Skip to content
Permalink
Browse files
8256359: AArch64: runtime/ReservedStack/ReservedStackTestCompiler.jav…
…a fails

Reviewed-by: yan
Backport-of: 4e43b28
  • Loading branch information
Sergey Nazarkin authored and Yuri Nesterenko committed Apr 21, 2021
1 parent 6313a7c commit ee8051fa2456ad76e9393302cd2f5d0ac00bf478
Showing with 7 additions and 2 deletions.
  1. +7 −2 src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp
@@ -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(
@@ -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

1 comment on commit ee8051f

@openjdk-notifier

This comment has been minimized.

Copy link

@openjdk-notifier openjdk-notifier bot commented on ee8051f Apr 21, 2021

Please sign in to comment.