infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-01-28 12:09:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

8254611: x86_32: Call to IRT::at_unwind clobbers rthread after JDK-8253180

Browse Source 
Reviewed-by: eosterlund
This commit is contained in:
Aleksey Shipilev 2020-10-13 05:47:03 +00:00
parent c9ca1bb025
commit 90de2894e9
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/hotspot/cpu/x86/interp_masm_x86.cpp
View File

@ -988,7 +988,7 @@ void InterpreterMacroAssembler::remove_activation(
const Register rmon = LP64_ONLY(c_rarg1) NOT_LP64(rcx);
// monitor pointers need different register
// because rdx may have the result in it
NOT_LP64(get_thread(rcx);)
NOT_LP64(get_thread(rthread);)
// The below poll is for the stack watermark barrier. It allows fixing up frames lazily,
// that would normally not be safe to use. Such bad returns into unsafe territory of
@ -1001,6 +1001,7 @@ void InterpreterMacroAssembler::remove_activation(
push(state);
call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::at_unwind));
pop(state);
NOT_LP64(get_thread(rthread);) // call_VM clobbered it, restore
bind(fast_path);
// get the value of _do_not_unlock_if_synchronized into rdx