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

8276635: Use blessed modifier order in compiler code #6253

Closed
wants to merge 2 commits into from

Conversation

magicus
Copy link
Member

@magicus magicus commented Nov 4, 2021

I ran bin/blessed-modifier-order.sh on source owned by compiler. 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.


Progress

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

Issue

  • JDK-8276635: Use blessed modifier order in compiler code

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 6253

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 4, 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 the rfr Pull request is ready for review label Nov 4, 2021
@openjdk
Copy link

openjdk bot commented Nov 4, 2021

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

  • compiler
  • core-libs
  • javadoc

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 javadoc javadoc-dev@openjdk.org core-libs core-libs-dev@openjdk.org compiler compiler-dev@openjdk.org labels Nov 4, 2021
@mlbridge
Copy link

mlbridge bot commented Nov 4, 2021

Webrevs

Copy link
Member

@jddarcy jddarcy left a comment

Choose a reason for hiding this comment

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

Looks fine.

@openjdk
Copy link

openjdk bot commented Nov 4, 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:

8276635: Use blessed modifier order in compiler code

Reviewed-by: darcy

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

  • 1533b81: 8276629: Use blessed modifier order in core-libs code
  • 7bb2173: 8276199: java/nio/channels/FileChannel/LargeGatheringWrite.java fails to terminate correctly
  • b57715a: 8276573: Use blessed modifier order in jdk.javadoc
  • bf4ddf9: 8276338: Minor improve of wording for String.to(Lower|Upper)Case
  • afb502e: 8276550: Use SHA256 hash in build.tools.depend.Depend
  • 49b7b2e: 8276640: Use blessed modifier order in jfr code
  • 5acff75: 8276429: CodeHeapState::print_names() fails with "assert(klass->is_loader_alive()) failed: must be alive"
  • a6fa6ed: 8268779: ZGC: runtime/InternalApi/ThreadCpuTimesDeadlock.java#id1 failed with "OutOfMemoryError: Java heap space"
  • 19075b3: 8275788: Create code element with suitable attributes for code snippets
  • 7de653e: 8276301: G1: Refine implementation of G1CardSetFreePool::memory_sizes()
  • ... and 2 more: https://git.openjdk.java.net/jdk/compare/c62b3476ce12cea633abead0d6376ea0a05f92f9...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 Pull request is ready to be integrated label Nov 4, 2021
@magicus
Copy link
Member Author

magicus commented Nov 5, 2021

/integrate

@openjdk
Copy link

openjdk bot commented Nov 5, 2021

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

  • d95299a: 8276634: Remove usePlainDatagramSocketImpl option from the test DatagramChannel/SendReceiveMaxSize.java
  • 3c0faa7: 8276173: Clean up and remove unneeded casts in HeapDumper
  • 323d201: 8275506: Rename allocated_on_stack to allocated_on_stack_or_embedded
  • 96c396b: 8276151: AArch64: Incorrect result for double to int vector conversion
  • 7281861: 8272065: jcmd cannot rely on the old core reflection implementation which will be changed after JEP 416
  • 8e17ce0: 8275185: Remove dead code and clean up jvmstat LocalVmManager
  • 396132f: 8275509: ModuleDescriptor.hashCode isn't reproducible across builds
  • 9ad4d3d: 8276025: Hotspot's libsvml.so may conflict with user dependency
  • e21b5c7: 8276650: GenGraphs does not produce deterministic output
  • 7b1916e: 8233557: [TESTBUG] DoubleClickTitleBarTest.java fails on macOs
  • ... and 18 more: https://git.openjdk.java.net/jdk/compare/c62b3476ce12cea633abead0d6376ea0a05f92f9...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Nov 5, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Nov 5, 2021
@openjdk
Copy link

openjdk bot commented Nov 5, 2021

@magicus Pushed as commit 0616d86.

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

@magicus magicus deleted the compiler-blessed-order branch November 11, 2021 14:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
compiler compiler-dev@openjdk.org core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated javadoc javadoc-dev@openjdk.org
Development

Successfully merging this pull request may close these issues.

2 participants