Skip to content

Commit 579e50b

Browse files
committed
8255564: InterpreterMacroAssembler::remove_activation() needs to restore thread right after VM call on x86_32
Reviewed-by: dholmes, shade
1 parent 4b20e46 commit 579e50b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/hotspot/cpu/x86/interp_masm_x86.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1005,9 +1005,9 @@ void InterpreterMacroAssembler::remove_activation(
10051005
push(state);
10061006
set_last_Java_frame(rthread, noreg, rbp, (address)pc());
10071007
super_call_VM_leaf(CAST_FROM_FN_PTR(address, InterpreterRuntime::at_unwind), rthread);
1008+
NOT_LP64(get_thread(rthread);) // call_VM clobbered it, restore
10081009
reset_last_Java_frame(rthread, true);
10091010
pop(state);
1010-
NOT_LP64(get_thread(rthread);) // call_VM clobbered it, restore
10111011
bind(fast_path);
10121012

10131013
// get the value of _do_not_unlock_if_synchronized into rdx

0 commit comments

Comments
 (0)