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

JDK-8296149: Start of release updates for JDK 21 #10924

Closed
wants to merge 20 commits into from

Conversation

jddarcy
Copy link
Member

@jddarcy jddarcy commented Nov 1, 2022

Usual start-of-release updates. Symbol updates in initial version reflect JDK 20 build 21.


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
  • Change requires a CSR request to be approved

Issues

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 10924

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/10924.diff

@jddarcy jddarcy marked this pull request as draft November 1, 2022 05:50
@bridgekeeper
Copy link

bridgekeeper bot commented Nov 1, 2022

👋 Welcome back darcy! 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
Copy link

openjdk bot commented Nov 1, 2022

@jddarcy The following labels will be automatically applied to this pull request:

  • build
  • compiler
  • core-libs
  • hotspot-runtime

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added hotspot-runtime hotspot-runtime-dev@openjdk.org build build-dev@openjdk.org core-libs core-libs-dev@openjdk.org compiler compiler-dev@openjdk.org labels Nov 1, 2022
@jddarcy
Copy link
Member Author

jddarcy commented Nov 2, 2022

/issue add JDK-8296150

@openjdk
Copy link

openjdk bot commented Nov 2, 2022

@jddarcy
Adding additional issue to issue list: 8296150: Add SourceVersion.RELEASE_21.

@jddarcy
Copy link
Member Author

jddarcy commented Nov 2, 2022

/issue add JDK-8296151

@openjdk
Copy link

openjdk bot commented Nov 2, 2022

@jddarcy
Adding additional issue to issue list: 8296151: Add source 21 and target 21 to javac.

@openjdk openjdk bot added the csr Pull request needs approved CSR before integration label Nov 2, 2022
@jddarcy jddarcy marked this pull request as ready for review November 29, 2022 04:13
@jddarcy
Copy link
Member Author

jddarcy commented Nov 29, 2022

Flipping the draft-bit off for this PR ahead of the upcoming start of JDK 21.

Symbol information now up-to-date as of JDK 20 b25.

@openjdk openjdk bot added the rfr Pull request is ready for review label Nov 29, 2022
@mlbridge
Copy link

mlbridge bot commented Nov 29, 2022

Webrevs

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

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

I looked at everything bar the sym files. All seems fine/usual.

One query below (probably one I ask each release).

Thanks.

@@ -44,7 +44,7 @@
* @see AbstractAnnotationValueVisitor9
* @since 14
*/
@SupportedSourceVersion(RELEASE_20)
@SupportedSourceVersion(RELEASE_21)
Copy link
Member

Choose a reason for hiding this comment

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

It is a pity these have to be updated each release. Is there no way to say latest here?

Copy link
Member Author

Choose a reason for hiding this comment

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

Not with the current language specification, no.

The only enum value "constant-enough" to use in an annotation is the name of an enum constant, a public static final field assigned an enum value is not enough.

On the flip side, I make the updates to these annotations using a one-line sed script I have saved away in a comment on one of the previous start-of-release-updates-for-JDK-N bugs. Using the annotations in this way is in lieu of adding another type specification for the JDK version. In other words, having AbstractAnnotationValueVisitor14.java with an annotation indicating RELEASE_21 prevents having AbstractAnnotationValueVisitor15, AbstractAnnotationValueVisitor16, ... , AbstractAnnotationValueVisitor21.

New visitors are now only introduced when adding new kinds of structures requires differences in behavior.

Thanks for the review.

Copy link
Contributor

@vicente-romero-oracle vicente-romero-oracle left a comment

Choose a reason for hiding this comment

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

looks good

@@ -88,7 +88,8 @@ static enum SourceTarget {
SEVENTEEN(false, "61.0", "17", Versions::checksrc17),
EIGHTEEN(false, "62.0", "18", Versions::checksrc18),
NINETEEN(false, "63.0", "19", Versions::checksrc19),
TWENTY(false, "64.0", "20", Versions::checksrc20);
TWENTY(false, "64.0", "20", Versions::checksrc20),
Copy link
Member

Choose a reason for hiding this comment

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

nit:

Suggested change
TWENTY(false, "64.0", "20", Versions::checksrc20),
TWENTY(false, "64.0", "20", Versions::checksrc20),

Copy link
Contributor

@lahodaj lahodaj left a comment

Choose a reason for hiding this comment

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

javac changes look fine to me.

@openjdk openjdk bot removed the csr Pull request needs approved CSR before integration label Dec 5, 2022
@openjdk
Copy link

openjdk bot commented Dec 5, 2022

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

8296149: Start of release updates for JDK 21
8296150: Add SourceVersion.RELEASE_21
8296151: Add source 21 and target 21 to javac

Reviewed-by: dholmes, iris, erikj, vromero, jlahoda

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 5 new commits pushed to the master branch:

  • cd2182a: 8295724: VirtualMachineError: Out of space in CodeCache for method handle intrinsic
  • 2cdc019: 8298178: Update to use jtreg 7.1.1
  • 79d163d: 8293412: Remove unnecessary java.security.egd overrides
  • ea83cb9: 8297450: ScaledTextFieldBorderTest.java fails when run with -show parameter
  • 336d230: 8297958: NMT: Display peak values

Please see this link for an up-to-date comparison between the source branch of this pull request and the master 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 master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Dec 5, 2022
Copy link
Member

@irisclark irisclark left a comment

Choose a reason for hiding this comment

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

Still looks good.

@jddarcy
Copy link
Member Author

jddarcy commented Dec 6, 2022

/integrate delegate

@openjdk openjdk bot added the delegated label Dec 6, 2022
@openjdk
Copy link

openjdk bot commented Dec 6, 2022

@jddarcy Integration of this pull request has been delegated and may be completed by any project committer using the /integrate pull request command.

@JesperIRL
Copy link
Member

/integrate

@openjdk
Copy link

openjdk bot commented Dec 8, 2022

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

  • d562d3f: 8297642: PhaseIdealLoop::only_has_infinite_loops must detect all loops that never lead to termination
  • fc52f21: 8298255: JFR provide information about dynamization of number of compiler threads
  • e555d54: 8298383: JFR: GenerateJfrFiles.java lacks copyright header
  • c084431: 8298379: JFR: Some UNTIMED events only sets endTime
  • ea108f5: 8298129: Let checkpoint event sizes grow beyond u4 limit
  • 165dcdd: 8297718: Make NMT free:ing protocol more granular
  • fbe7b00: 8298173: GarbageCollectionNotificationContentTest test failed: no decrease in Eden usage
  • d8ef60b: 8298272: Clean up ProblemList
  • 9353899: 8298175: JFR: Common timestamp for periodic events
  • 94575d1: 8295116: C2: assert(dead->outcnt() == 0 && !dead->is_top()) failed: node must be dead
  • ... and 49 more: https://git.openjdk.org/jdk/compare/0d2a9ee5287779c2e33fc0bfda84aa6128d8f479...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Dec 8, 2022
@openjdk openjdk bot closed this Dec 8, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review delegated labels Dec 8, 2022
@openjdk
Copy link

openjdk bot commented Dec 8, 2022

@JesperIRL Pushed as commit 175e3d3.

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

@jddarcy jddarcy deleted the JDK-8296149 branch June 10, 2023 20:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build build-dev@openjdk.org compiler compiler-dev@openjdk.org core-libs core-libs-dev@openjdk.org hotspot-runtime hotspot-runtime-dev@openjdk.org integrated Pull request has been integrated
8 participants