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.

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

8310913: Move ReferencedKeyMap to jdk.internal so it may be shared #342

Closed

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Mar 8, 2024

Unclean backport to match the codebases between mainline and JDK 21, simplifying maintenance. It also implicitly fixes JDK-8323505, since this move includes a few touchups to the test.

The uncleanliness comes from MethodType.java conflicts that does not have JDK-8310849 in JDK 21. So it yields a few contextual conflicts. Since affected hunks are just removals, I removed them by hand.

There is a follow-up, JDK-8325255, but it does not seem to affect anything yet, since there are no ReferenceKeySet.add calls anywhere in sight. We can backport that separately.

Additional testing:

  • MacOS AArch64 Server fastdebug, jdk/internal/util tests pass
  • MacOS AArch64 Server fastdebug, java/lang/invoke tests pass
  • Linux AArch64 Server fastdebug, all tests pass

Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8310913 needs maintainer approval

Issue

  • JDK-8310913: Move ReferencedKeyMap to jdk.internal so it may be shared (Enhancement - P3 - Approved)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk21u-dev.git pull/342/head:pull/342
$ git checkout pull/342

Update a local copy of the PR:
$ git checkout pull/342
$ git pull https://git.openjdk.org/jdk21u-dev.git pull/342/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 342

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk21u-dev/pull/342.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 8, 2024

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

@openjdk openjdk bot changed the title Backport 6af0af593446bc33dc94bbf7334c325c4ac0ac0f 8310913: Move ReferencedKeyMap to jdk.internal so it may be shared Mar 8, 2024
@openjdk
Copy link

openjdk bot commented Mar 8, 2024

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added the backport label Mar 8, 2024
Reviewed-by: naoto, rriggs, mchung, liach
@shipilev shipilev force-pushed the JDK-8310913-referenced-key-map branch from f1ff3b7 to d95e43c Compare March 13, 2024 16:44
@openjdk
Copy link

openjdk bot commented Mar 13, 2024

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

8310913: Move ReferencedKeyMap to jdk.internal so it may be shared

Reviewed-by: rrich

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 master 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 master branch, type /integrate in a new comment.

@shipilev shipilev marked this pull request as ready for review March 14, 2024 13:18
@shipilev
Copy link
Member Author

RISC-V GHA failure is environmental.

@openjdk openjdk bot added the rfr Pull request is ready for review label Mar 14, 2024
@shipilev
Copy link
Member Author

/approval request Unclean backport to match the codebases between mainline and JDK 21, simplifying maintenance. It also implicitly fixes JDK-8323505, since this move includes a few touchups to the test. In mainline since August 2023, there is a small bugtail (JDK-8325255) that does not affect current uses. All tests pass.

@openjdk
Copy link

openjdk bot commented Mar 14, 2024

@shipilev
8310913: The approval request has been created successfully.

@openjdk openjdk bot added the approval label Mar 14, 2024
@mlbridge
Copy link

mlbridge bot commented Mar 14, 2024

Webrevs

@openjdk openjdk bot removed the approval label Mar 21, 2024
@bridgekeeper
Copy link

bridgekeeper bot commented Apr 22, 2024

@shipilev This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@reinrich
Copy link
Member

reinrich commented May 6, 2024

There is a follow-up, JDK-8325255, but it does not seem to affect anything yet, since there are no ReferenceKeySet.add calls anywhere in sight. We can backport that separately.

Don't you think that will be forgotten?

@shipilev
Copy link
Member Author

shipilev commented May 6, 2024

There is a follow-up, JDK-8325255, but it does not seem to affect anything yet, since there are no ReferenceKeySet.add calls anywhere in sight. We can backport that separately.

Don't you think that will be forgotten?

Not sure what do you mean.

@reinrich
Copy link
Member

reinrich commented May 6, 2024

There is a follow-up, JDK-8325255, but it does not seem to affect anything yet, since there are no ReferenceKeySet.add calls anywhere in sight. We can backport that separately.

Don't you think that will be forgotten?

Not sure what do you mean.

Likely a misunderstanding on my side: I thought you did not want to backport JDK-8325255 until ReferenceKeySet is referenced. But you're going to do the backport soon after this backport, correct?

@shipilev
Copy link
Member Author

shipilev commented May 6, 2024

Likely a misunderstanding on my side: I thought you did not want to backport JDK-8325255 until ReferenceKeySet is referenced. But you're going to do the backport soon after this backport, correct?

Yes. I was merely pointing out that we don't have to backport JDK-8325255 along with JDK-8310913 atomically, because it technically does not break anything yet. Otherwise we would need to cobble together JDK-8325255 and JDK-8310913 into an atomic integration to avoid any breakage window. We can just sequence it for inclusion a bit later.

Since you are here, maybe you would like to Review this PR? I jumped a gun a little here and got approval before RFR was formally reviewed, and I still cannot integrate :) I'll pull from master momentarily.

@reinrich
Copy link
Member

reinrich commented May 6, 2024

This inquiry is part of my review :)
I'm going to approve now...

Copy link
Member

@reinrich reinrich left a comment

Choose a reason for hiding this comment

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

The backport looks good.
Please make sure not to forget the follow-up JDK-8325255.

Cheers, Richard.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label May 6, 2024
@shipilev
Copy link
Member Author

shipilev commented May 6, 2024

The backport looks good.

Thanks! I am re-running tests now, and will integrate once they turn up green.

Please make sure not to forget the follow-up JDK-8325255.

Yes, I plan to propose it after integrating this one.

@shipilev
Copy link
Member Author

shipilev commented May 7, 2024

/integrate

@openjdk
Copy link

openjdk bot commented May 7, 2024

Going to push as commit ec6b326.
Since your change was applied there have been 3 commits pushed to the master branch:

  • 92b43c5: 8317007: Add bulk removal of dead nmethods during class unloading
  • ed2f5a8: 8310228: Improve error reporting for uncaught native exceptions on Windows
  • 7a400f2: 8309890: TestStringDeduplicationInterned.java waits for the wrong condition

Your commit was automatically rebased without conflicts.

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

openjdk bot commented May 7, 2024

@shipilev Pushed as commit ec6b326.

💡 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
backport integrated Pull request has been integrated
2 participants