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

8276628: Use blessed modifier order in serviceability code #6249

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 serviceability. 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-8276628: Use blessed modifier order in serviceability code

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 6249

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper 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 label Nov 4, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Nov 4, 2021

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

  • hotspot-gc
  • jmx
  • serviceability
  • shenandoah

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 serviceability jmx hotspot-gc shenandoah labels Nov 4, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Nov 4, 2021

Webrevs

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Looks fine to me.

Thanks,
David

@openjdk
Copy link

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

8276628: Use blessed modifier order in serviceability code

Reviewed-by: dholmes, lmesnik, cjplummer

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

  • e21b5c7: 8276650: GenGraphs does not produce deterministic output
  • 7b1916e: 8233557: [TESTBUG] DoubleClickTitleBarTest.java fails on macOs
  • 8ec80c4: 8276653: Missing row headers in j.l.Character docs
  • 7e87f94: 8276652: Missing row headers in MethodHandles.Lookup docs
  • dcf36f8: 8275670: ciReplay: java.lang.NoClassDefFoundError when trying to load java/lang/invoke/LambdaForm$MH
  • 81203ef: 8276655: Use blessed modifier order in SCTP
  • 2b5a32c: 8275718: Relax memory constraint on exception counter updates
  • 99d4b07: 8276649: MethodHandles.Lookup docs: replace the table in the cross-module access check section with list
  • 1533b81: 8276629: Use blessed modifier order in core-libs code
  • 7bb2173: 8276199: java/nio/channels/FileChannel/LargeGatheringWrite.java fails to terminate correctly
  • ... and 10 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 label Nov 4, 2021
lmesnik
lmesnik approved these changes Nov 4, 2021
Copy link
Contributor

@plummercj plummercj left a comment

Copyright updates?

@magicus
Copy link
Member Author

@magicus magicus commented Nov 4, 2021

@plummercj That's really kind of an edge case, considering the triviality of these changes. But yes, the norm in the JDK is to update the copyright year for all changes, so you're right, I should do that.

(And we really ought to wrangle free some resources to write tooling for us to do all the copyright dances...)

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Good catch on copyright updates @plummercj ! We always have to update when we modify a file - the one exception is changing the wording of the copyright notice itself.

Looks good.

David

@magicus
Copy link
Member Author

@magicus magicus commented Nov 5, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Nov 5, 2021

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

  • b933136: 8276641: Use blessed modifier order in jshell
  • 0616d86: 8276635: Use blessed modifier order in compiler code
  • 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
  • ... and 20 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 and removed ready rfr labels Nov 5, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Nov 5, 2021

@magicus Pushed as commit 7023b3f.

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

@AnirvanSarkar
Copy link
Member

@AnirvanSarkar AnirvanSarkar commented Nov 8, 2021

(And we really ought to wrangle free some resources to write tooling for us to do all the copyright dances...)

OpenJFX team seems to have a copyright update script[1].
Maybe @kevinrushforth can tell if it can be retrofitted and used by OpenJDK project.

[1] : https://bugs.openjdk.java.net/browse/JDK-8214793?focusedCommentId=14233661&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-14233661

@magicus magicus deleted the serviceability-blessed-order branch Nov 11, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-gc integrated jmx serviceability shenandoah
5 participants