Skip to content

Conversation

@RogerRiggs
Copy link
Collaborator

@RogerRiggs RogerRiggs commented Aug 27, 2025

As observed in JDK-8366043 [lworld] (LIFE = Legacy Idiom For Equality) causes performance regressions.
Updating HashMap and ConcurrentHashMap to use java.util.Objects.equals will make it easier to measure performance of options that remove or modify the use of ==

Replace constructs like:

-                        ((k = e.key) == key || (key != null && key.equals(k))))
with:
+                        Objects.equals(key, k))

The changes in ConcurrentHashMap are a bit different due to the use of null as a sentinel.

The order of arguments to the .equals methods must remain the same to ensure compatibility.


Progress

  • Change must not contain extraneous whitespace

Issue

  • JDK-8366214: [lworld] Use Objects.equals in HashMap and ConcurrentHashmap (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1536

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

Using diff file

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

Using Webrev

Link to Webrev Comment

Replace constructs like:
-                        ((k = e.key) == key || (key != null && key.equals(k))))
with:
+                        Objects.equals(key, k))

The changes in ConcurrentHashMap are a bit different due to the use of null as a sentinel.

The order of arguments to the .equals methods must remain the same to ensure compatibility.
@bridgekeeper
Copy link

bridgekeeper bot commented Aug 27, 2025

👋 Welcome back rriggs! 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 Aug 27, 2025

@RogerRiggs 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:

8366214: [lworld] Use Objects.equals in HashMap and ConcurrentHashmap

Reviewed-by: liach

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 221 new commits pushed to the lworld branch:

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this 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 Aug 27, 2025
@mlbridge
Copy link

mlbridge bot commented Aug 27, 2025

Webrevs

Copy link
Member

@liach liach left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think my concerns are addressed so far.

@RogerRiggs
Copy link
Collaborator Author

/integrate

@openjdk
Copy link

openjdk bot commented Sep 3, 2025

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

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Sep 3, 2025

@RogerRiggs Pushed as commit c8d4a24.

💡 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.

2 participants