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

8277012: Use blessed modifier order in src/utils #6354

Closed
wants to merge 1 commit into from

Conversation

magicus
Copy link
Member

@magicus magicus commented Nov 11, 2021

I ran bin/blessed-modifier-order.sh on source code in src/utils. This scripts verifies that modifiers are in the "blessed" order, and fixes it otherwise. I have manually checked the changes made by the script to make sure they are sound.

There are no clear ownership of this code, but I believe it's kind of hotspot-related.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/6354/head:pull/6354
$ git checkout pull/6354

Update a local copy of the PR:
$ git checkout pull/6354
$ git pull https://git.openjdk.java.net/jdk pull/6354/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 6354

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/6354.diff

@magicus
Copy link
Member Author

@magicus magicus commented Nov 11, 2021

/label hotspot build

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Nov 11, 2021

👋 Welcome back ihse! 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 added rfr hotspot build labels Nov 11, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Nov 11, 2021

@magicus
The hotspot label was successfully added.

The build label was successfully added.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Nov 11, 2021

Webrevs

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Looks fine.

Thanks,
David

@openjdk
Copy link

@openjdk openjdk bot commented Nov 12, 2021

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

8277012: Use blessed modifier order in src/utils

Reviewed-by: dholmes, stuefe

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

  • 6b833db: 8275329: ZGC: vmTestbase/gc/gctests/SoftReference/soft004/soft004.java fails with assert(_phases->length() <= 1000) failed: Too many recored phases?
  • 1e941de: 8275197: Remove unused fields in ThaiBuddhistChronology
  • 6954b98: 8186670: Implement _onSpinWait() intrinsic for AArch64
  • 3445e50: 8276265: jcmd man page is outdated
  • 0ca0acf: 8276947: Clarify how DateTimeFormatterBuilder.appendFraction handles value ranges
  • b0d7a9d: 8276994: java/nio/channels/Channels/TransferTo.java leaves multi-GB files in /tmp
  • 8aae88b: 8276763: java/nio/channels/SocketChannel/AdaptorStreams.java fails with "SocketTimeoutException: Read timed out"
  • 6f35eed: 8079267: [TEST_BUG] Test java/awt/Frame/MiscUndecorated/RepaintTest.java fails
  • 5e98f99: 8276800: Fix table headers in NumericShaper.html
  • 2ca4ff8: 8244202: Implementation of JEP 418: Internet-Address Resolution SPI
  • ... and 15 more: https://git.openjdk.java.net/jdk/compare/ce3ed65ac3411a533052a8c01231f7e540803afb...master

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 label Nov 12, 2021
Copy link
Member

@tstuefe tstuefe left a comment

+1

@magicus
Copy link
Member Author

@magicus magicus commented Nov 12, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Nov 12, 2021

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

  • 13deb38: 8276848: sun.net.httpserver.simpleserver.CommandLinePositiveTest: test does not specify port
  • 710f496: 8273277: C2: Move conditional negation into rc_predicate
  • 6b833db: 8275329: ZGC: vmTestbase/gc/gctests/SoftReference/soft004/soft004.java fails with assert(_phases->length() <= 1000) failed: Too many recored phases?
  • 1e941de: 8275197: Remove unused fields in ThaiBuddhistChronology
  • 6954b98: 8186670: Implement _onSpinWait() intrinsic for AArch64
  • 3445e50: 8276265: jcmd man page is outdated
  • 0ca0acf: 8276947: Clarify how DateTimeFormatterBuilder.appendFraction handles value ranges
  • b0d7a9d: 8276994: java/nio/channels/Channels/TransferTo.java leaves multi-GB files in /tmp
  • 8aae88b: 8276763: java/nio/channels/SocketChannel/AdaptorStreams.java fails with "SocketTimeoutException: Read timed out"
  • 6f35eed: 8079267: [TEST_BUG] Test java/awt/Frame/MiscUndecorated/RepaintTest.java fails
  • ... and 17 more: https://git.openjdk.java.net/jdk/compare/ce3ed65ac3411a533052a8c01231f7e540803afb...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Nov 12, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Nov 12, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Nov 12, 2021

@magicus Pushed as commit c4b4432.

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

@magicus magicus deleted the utils-blessed-order branch Dec 3, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build hotspot integrated
3 participants