-
Notifications
You must be signed in to change notification settings - Fork 109
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
Conversation
👋 Welcome back shade! A progress list of the required criteria for merging this PR into |
This backport pull request has now been updated with issue from the original commit. |
Reviewed-by: naoto, rriggs, mchung, liach
f1ff3b7
to
d95e43c
Compare
@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:
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 ➡️ To integrate this PR with the above commit message to the |
RISC-V GHA failure is environmental. |
/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. |
Webrevs
|
@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! |
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 |
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. |
This inquiry is part of my review :) |
There was a problem hiding this 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.
Thanks! I am re-running tests now, and will integrate once they turn up green.
Yes, I plan to propose it after integrating this one. |
/integrate |
Going to push as commit ec6b326.
Your commit was automatically rebased without conflicts. |
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:
jdk/internal/util
tests passjava/lang/invoke
tests passall
tests passProgress
Issue
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