Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

8277411: C2 fast_unlock intrinsic on AArch64 has unnecessary ownership check #660

Closed
wants to merge 2 commits into from
Closed

8277411: C2 fast_unlock intrinsic on AArch64 has unnecessary ownership check #660

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac64fa7
Backport 3d810ad6912b7bca03e212b604cf60412da11c18
dchuyko Sep 8, 2022
49f1141
Merge branch 'openjdk:master' into JDK-8277411
dchuyko Sep 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 1 addition & 5 deletions src/hotspot/cpu/aarch64/aarch64.ad
View file
Open in desktop
Expand Up @@ -3913,19 +3913,15 @@ encode %{
__ bind(object_has_monitor);
STATIC_ASSERT(markWord::monitor_value <= INT_MAX);
__ add(tmp, tmp, -(int)markWord::monitor_value); // monitor
__ ldr(rscratch1, Address(tmp, ObjectMonitor::owner_offset_in_bytes()));
__ ldr(disp_hdr, Address(tmp, ObjectMonitor::recursions_offset_in_bytes()));

Label notRecursive;
__ cmp(rscratch1, rthread);
__ br(Assembler::NE, cont);

__ cbz(disp_hdr, notRecursive);

// Recursive lock
__ sub(disp_hdr, disp_hdr, 1u);
__ str(disp_hdr, Address(tmp, ObjectMonitor::recursions_offset_in_bytes()));
// flag == EQ was set in the ownership check above
__ cmp(disp_hdr, disp_hdr); // Sets flags for result
__ b(cont);

__ bind(notRecursive);
Expand Down