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

Merge jdk20 #11952

Closed
wants to merge 8 commits into from
Closed

Merge jdk20 #11952

wants to merge 8 commits into from

Conversation

JesperIRL
Copy link
Member

@JesperIRL JesperIRL commented Jan 11, 2023

Forwardport JDK 20 -> JDK 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

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 11952

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

Using diff file

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

Sorry, something went wrong.

vidmik and others added 8 commits January 10, 2023 04:39
…ure with -XX:+PrintC1Statistics

Co-authored-by: Ningsheng Jian <njian@openjdk.org>
Reviewed-by: chagedorn, fyang, aph
…assert(oopDesc::is_oop(obj)) failed: not an oop

Co-authored-by: Fei Yang <fyang@openjdk.org>
Reviewed-by: aph, fyang, dcubed
@bridgekeeper
Copy link

bridgekeeper bot commented Jan 11, 2023

👋 Welcome back jwilhelm! 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 Jan 11, 2023

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

Merge

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 1 new commit pushed to the master branch:

  • 9c1e98d: 8298321: 2 File Leak defect groups in 2 files

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 ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jan 11, 2023
@openjdk
Copy link

openjdk bot commented Jan 11, 2023

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

  • client
  • compiler
  • core-libs
  • hotspot

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 hotspot-dev@openjdk.org client client-libs-dev@openjdk.org core-libs core-libs-dev@openjdk.org compiler compiler-dev@openjdk.org labels Jan 11, 2023
@mlbridge
Copy link

mlbridge bot commented Jan 11, 2023

Webrevs

@JesperIRL
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Jan 11, 2023

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

  • 8db73f7: 8300001: ProblemList test java/security/Policy/Root/Root.java
  • 43847c4: 8298065: Provide more information in message of NoSuchFieldError
  • a17b563: 8299918: Update Xcode11.3.1-MacOSX10.15 devkit at Oracle
  • 9c1e98d: 8298321: 2 File Leak defect groups in 2 files

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 11, 2023

@JesperIRL Pushed as commit 33f3bd8.

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

@JesperIRL JesperIRL deleted the Merge_jdk20 branch January 11, 2023 22:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
client client-libs-dev@openjdk.org compiler compiler-dev@openjdk.org core-libs core-libs-dev@openjdk.org hotspot hotspot-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

None yet

6 participants