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

8252530: Fix inconsistencies in hotspot whitebox #2006

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Jun 29, 2023

I backport this for parity with 11.0.21-oracle.

I had to resolve because isC2OrJVMCIIncludedInVmBuild is not in 11.


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

Issue

  • JDK-8252530: Fix inconsistencies in hotspot whitebox (Enhancement - P5)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2006

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 29, 2023

👋 Welcome back goetz! 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 ab17be283559ba0477bc0dcbd11dbfccf155a57f 8252530: Fix inconsistencies in hotspot whitebox Jun 29, 2023
@openjdk
Copy link

openjdk bot commented Jun 29, 2023

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

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Jun 29, 2023
@mlbridge
Copy link

mlbridge bot commented Jun 29, 2023

Webrevs

@GoeLin
Copy link
Member Author

GoeLin commented Jun 30, 2023

Pre-submit test: infra issue.

Copy link
Contributor

@RealLucy RealLucy left a comment

Choose a reason for hiding this comment

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

LGTM.

@openjdk
Copy link

openjdk bot commented Jun 30, 2023

@GoeLin This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8252530: Fix inconsistencies in hotspot whitebox

Reviewed-by: lucy

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

  • 339518e: 8306484: Open source several AWT Choice jtreg tests
  • aa54ef1: 8306682: Open source a few more AWT Choice tests
  • 54cb972: 8298974: Add ftcolor.c to imported freetype sources
  • abfab03: 8228403: SignTwice.java failed with java.io.FileNotFoundException: File name too long
  • 142d467: 8298921: Create a regression test for JDK-8139581
  • d45544d: 8241097: java/math/BigInteger/largeMemory/SymmetricRangeTests.java requires -XX:+CompactStrings
  • 186d04c: 8221372: Test vmTestbase/nsk/jvmti/GetThreadState/thrstat001/TestDescription.java times out

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 Jun 30, 2023
@GoeLin
Copy link
Member Author

GoeLin commented Jul 3, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Jul 3, 2023

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

  • 9c97b37: 8265980: Fix systemDictionary and loaderConstraints printing
  • 339518e: 8306484: Open source several AWT Choice jtreg tests
  • aa54ef1: 8306682: Open source a few more AWT Choice tests
  • 54cb972: 8298974: Add ftcolor.c to imported freetype sources
  • abfab03: 8228403: SignTwice.java failed with java.io.FileNotFoundException: File name too long
  • 142d467: 8298921: Create a regression test for JDK-8139581
  • d45544d: 8241097: java/math/BigInteger/largeMemory/SymmetricRangeTests.java requires -XX:+CompactStrings
  • 186d04c: 8221372: Test vmTestbase/nsk/jvmti/GetThreadState/thrstat001/TestDescription.java times out

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jul 3, 2023

@GoeLin Pushed as commit da6c1c7.

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

@GoeLin GoeLin deleted the goetz_backport_8252530 branch July 3, 2023 18:53
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
Development

Successfully merging this pull request may close these issues.

2 participants