OpenJDK / jdk / jdk
changeset 55878:76a82db7181a
8228601: AArch64: Fix interpreter code at JVMCI deoptimization entry
Reviewed-by: adinn, aph
| author | pli |
|---|---|
| date | Wed, 31 Jul 2019 09:52:28 +0800 |
| parents | a5ea1b64dcd7 |
| children | 5f3b05a36d61 |
| files | src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp Tue Jul 30 07:22:05 2019 +0200 +++ b/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp Wed Jul 31 09:52:28 2019 +0800 @@ -514,7 +514,7 @@ // only occur on method entry so emit it only for vtos with step 0. if ((EnableJVMCI || UseAOT) && state == vtos && step == 0) { Label L; - __ ldr(rscratch1, Address(rthread, Thread::pending_exception_offset())); + __ ldrb(rscratch1, Address(rthread, JavaThread::pending_monitorenter_offset())); __ cbz(rscratch1, L); // Clear flag. __ strb(zr, Address(rthread, JavaThread::pending_monitorenter_offset())); @@ -525,7 +525,7 @@ #ifdef ASSERT if (EnableJVMCI) { Label L; - __ ldr(rscratch1, Address(rthread, Thread::pending_exception_offset())); + __ ldrb(rscratch1, Address(rthread, JavaThread::pending_monitorenter_offset())); __ cbz(rscratch1, L); __ stop("unexpected pending monitor in deopt entry"); __ bind(L);