--- a/hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp Mon Aug 15 14:08:01 2016 -0700
+++ b/hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp Tue Aug 16 09:19:13 2016 -0700
@@ -1330,7 +1330,7 @@
__ increment(rsp, wordSize);
__ get_thread(thread);
- __ reset_last_Java_frame(thread, false, true);
+ __ reset_last_Java_frame(thread, false);
save_or_restore_arguments(masm, stack_slots, total_in_args,
arg_save_area, NULL, in_regs, in_sig_bt);
@@ -2224,7 +2224,7 @@
// We can finally stop using that last_Java_frame we setup ages ago
- __ reset_last_Java_frame(thread, false, true);
+ __ reset_last_Java_frame(thread, false);
// Unpack oop result
if (ret_type == T_OBJECT || ret_type == T_ARRAY) {
@@ -2553,7 +2553,7 @@
__ pop(rcx);
__ get_thread(rcx);
- __ reset_last_Java_frame(rcx, false, false);
+ __ reset_last_Java_frame(rcx, false);
// Load UnrollBlock into EDI
__ mov(rdi, rax);
@@ -2702,7 +2702,7 @@
__ push(rax);
__ get_thread(rcx);
- __ reset_last_Java_frame(rcx, false, false);
+ __ reset_last_Java_frame(rcx, false);
// Collect return values
__ movptr(rax,Address(rsp, (RegisterSaver::raxOffset() + additional_words + 1)*wordSize));
@@ -2806,7 +2806,7 @@
__ get_thread(rcx);
- __ reset_last_Java_frame(rcx, false, false);
+ __ reset_last_Java_frame(rcx, false);
// Load UnrollBlock into EDI
__ movptr(rdi, rax);
@@ -2912,7 +2912,7 @@
oop_maps->add_gc_map( __ pc()-start, new OopMap( framesize, 0 ) );
__ get_thread(rdi);
- __ reset_last_Java_frame(rdi, true, false);
+ __ reset_last_Java_frame(rdi, true);
// Pop self-frame.
__ leave(); // Epilog!
@@ -3007,7 +3007,7 @@
// Clear last_Java_sp again
__ get_thread(java_thread);
- __ reset_last_Java_frame(java_thread, false, false);
+ __ reset_last_Java_frame(java_thread, false);
__ cmpptr(Address(java_thread, Thread::pending_exception_offset()), (int32_t)NULL_WORD);
__ jcc(Assembler::equal, noException);
@@ -3082,7 +3082,7 @@
__ addptr(rsp, wordSize);
// clear last_Java_sp
- __ reset_last_Java_frame(thread, true, false);
+ __ reset_last_Java_frame(thread, true);
// check for pending exceptions
Label pending;
__ cmpptr(Address(thread, Thread::pending_exception_offset()), (int32_t)NULL_WORD);