Skip to content

Conversation

TobiHartmann
Copy link
Member

@TobiHartmann TobiHartmann commented Sep 4, 2025

Since JDK-8335256 / #1447 we attempt lock elimination already before Escape Analysis. However, allocations of locked objects might block lock elimination if their escape state isn't determined yet and we only got one chance at eliminating the lock:

// After coarsened locks are eliminated locking regions
// become unbalanced. We should not execute any more
// locks elimination optimizations on them.
C->mark_unbalanced_boxes();

I changed the code such that we only attempt lock elimination after EA and added a corresponding regression test.

Thanks,
Tobias


Progress

  • Change must not contain extraneous whitespace

Issue

  • JDK-8366879: [lworld] C2's lock elimination fails after JDK-8335256 (Bug - P3)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/valhalla.git pull/1546/head:pull/1546
$ git checkout pull/1546

Update a local copy of the PR:
$ git checkout pull/1546
$ git pull https://git.openjdk.org/valhalla.git pull/1546/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1546

View PR using the GUI difftool:
$ git pr show -t 1546

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/valhalla/pull/1546.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 4, 2025

👋 Welcome back thartmann! A progress list of the required criteria for merging this PR into lworld will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented Sep 4, 2025

@TobiHartmann This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8366879: [lworld] C2's lock elimination fails after JDK-8335256

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been no new commits pushed to the lworld branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the lworld branch, type /integrate in a new comment.

@openjdk openjdk bot added ready Pull request is ready to be integrated rfr Pull request is ready for review labels Sep 4, 2025
@mlbridge
Copy link

mlbridge bot commented Sep 4, 2025

Webrevs

@TobiHartmann
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Sep 5, 2025

Going to push as commit 858be30.
Since your change was applied there have been 2 commits pushed to the lworld branch:

  • 2fddd34: 8366913: [lworld] Add ACC_STRICT_INIT to ClassFile
  • 59ffa2d: 8366267: [lworld] Injected ACC_IDENTITY escapes to instrumentation of older classes

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Sep 5, 2025
@openjdk openjdk bot closed this Sep 5, 2025
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Sep 5, 2025
@openjdk
Copy link

openjdk bot commented Sep 5, 2025

@TobiHartmann Pushed as commit 858be30.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

1 participant