--- a/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp Mon Aug 15 14:08:01 2016 -0700
+++ b/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp Tue Aug 16 17:31:57 2016 +0100
@@ -2030,7 +2030,7 @@
__ bind(dtrace_method_exit_done);
}
- __ reset_last_Java_frame(false, true);
+ __ reset_last_Java_frame(false);
// Unpack oop result
if (ret_type == T_OBJECT || ret_type == T_ARRAY) {
@@ -2370,7 +2370,7 @@
__ bind(retaddr);
oop_maps->add_gc_map( __ pc()-start, map->deep_copy());
- __ reset_last_Java_frame(false, false);
+ __ reset_last_Java_frame(false);
__ b(after_fetch_unroll_info_call);
} // EnableJVMCI
@@ -2465,7 +2465,7 @@
// find any register it might need.
oop_maps->add_gc_map(__ pc() - start, map);
- __ reset_last_Java_frame(false, true);
+ __ reset_last_Java_frame(false);
#if INCLUDE_JVMCI
if (EnableJVMCI) {
@@ -2606,7 +2606,7 @@
new OopMap( frame_size_in_words, 0 ));
// Clear fp AND pc
- __ reset_last_Java_frame(true, true);
+ __ reset_last_Java_frame(true);
// Collect return values
__ ldrd(v0, Address(sp, RegisterSaver::v0_offset_in_bytes()));
@@ -2709,7 +2709,7 @@
oop_maps->add_gc_map(__ pc() - start, map);
- __ reset_last_Java_frame(false, true);
+ __ reset_last_Java_frame(false);
// move UnrollBlock* into r4
__ mov(r4, r0);
@@ -2828,7 +2828,7 @@
oop_maps->add_gc_map(the_pc - start, new OopMap(SimpleRuntimeFrame::framesize, 0));
// Clear fp AND pc
- __ reset_last_Java_frame(true, true);
+ __ reset_last_Java_frame(true);
// Pop self-frame.
__ leave(); // Epilog
@@ -2906,7 +2906,7 @@
Label noException;
- __ reset_last_Java_frame(false, true);
+ __ reset_last_Java_frame(false);
__ maybe_isb();
__ membar(Assembler::LoadLoad | Assembler::LoadStore);
@@ -2985,7 +2985,7 @@
// r0 contains the address we are going to jump to assuming no exception got installed
// clear last_Java_sp
- __ reset_last_Java_frame(false, true);
+ __ reset_last_Java_frame(false);
// check for pending exceptions
Label pending;
__ ldr(rscratch1, Address(rthread, Thread::pending_exception_offset()));
@@ -3116,7 +3116,7 @@
oop_maps->add_gc_map(the_pc - start, new OopMap(SimpleRuntimeFrame::framesize, 0));
- __ reset_last_Java_frame(false, true);
+ __ reset_last_Java_frame(false);
// Restore callee-saved registers