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

Reviewed-by: shade, adinn
This commit is contained in:
Andrew Haley 2020-11-26 17:52:54 +00:00
parent 6e0062236c
commit 4e43b28858
2 changed files with 7 additions and 3 deletions

View File

@ -681,14 +681,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(
@ -699,6 +701,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

View File

@ -87,7 +87,6 @@ gc/metaspace/CompressedClassSpaceSizeInJmapHeap.java 8241293 macosx-x64
runtime/cds/DeterministicDump.java 8253495 generic-all
runtime/jni/terminatedThread/TestTerminatedThread.java 8219652 aix-ppc64
runtime/ReservedStack/ReservedStackTest.java 8231031 generic-all
runtime/ReservedStack/ReservedStackTestCompiler.java 8256359 linux-aarch64
#############################################################################