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

8293123: Fix various include file ordering #23048

Closed
wants to merge 1 commit into from

Conversation

coleenp
Copy link
Contributor

@coleenp coleenp commented Jan 10, 2025

There were only a couple of files that violated the alphabetical sort order, where jvm.h is sorted as j.
Testing with tier1 sanity.


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-8293123: Fix various include file ordering (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 23048

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 10, 2025

👋 Welcome back coleenp! 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 10, 2025

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

8293123: Fix various include file ordering

Reviewed-by: dholmes, stefank

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

  • 6e43f48: 8346929: runtime/ClassUnload/DictionaryDependsTest.java fails with "Test failed: should be unloaded"
  • c885e59: 8346377: Properly support static builds for Windows
  • 0612636: 8347373: HTTP/2 flow control checks may count unprocessed data twice
  • 450636a: 8347274: Gatherers.mapConcurrent exhibits undesired behavior under variable delays, interruption, and finishing
  • 82e2a79: 8347006: LoadRangeNode floats above array guard in arraycopy intrinsic
  • 85ed78c: 8345185: Update jpackage to not include service bindings by default
  • 3b9732e: 8345471: Clean up compiler/intrinsics/sha/cli tests
  • ed0b555: 8344035: Replace predicate walking code in Loop Unswitching with a predicate visitor
  • b37f123: 8347407: [BACKOUT] C1/C2 don't handle allocation failure properly during initialization (RuntimeStub::new_runtime_stub fatal crash)
  • 1f7925c: 8347270: Remove unix_getParentPidAndTimings, unix_getChildren and unix_getCmdlineAndUserInfo
  • ... and 5 more: https://git.openjdk.org/jdk/compare/10f7142dce296fedbb4d945378473d44ecde34b7...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 rfr Pull request is ready for review label Jan 10, 2025
@openjdk
Copy link

openjdk bot commented Jan 10, 2025

@coleenp The following label will be automatically applied to this pull request:

  • hotspot

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@mlbridge
Copy link

mlbridge bot commented Jan 10, 2025

Webrevs

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

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

Some of these changes are not related to the listed JBS issue but I will leave it up to you if you want to broaden the scope of the issue to cover the more general out-of-order-include problem.

Thanks

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jan 13, 2025
Copy link
Member

@stefank stefank left a comment

Choose a reason for hiding this comment

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

Looks good (after David's comment about the title). Thanks for fixing!

@coleenp coleenp changed the title 8293123: Include of jvm.h breaks include block sort order 8293123: Fix various include file ordering Jan 13, 2025
@coleenp
Copy link
Contributor Author

coleenp commented Jan 13, 2025

Thanks for reviewing Stefan and David. I changed the title.
/integrate

@openjdk
Copy link

openjdk bot commented Jan 13, 2025

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

  • 6e43f48: 8346929: runtime/ClassUnload/DictionaryDependsTest.java fails with "Test failed: should be unloaded"
  • c885e59: 8346377: Properly support static builds for Windows
  • 0612636: 8347373: HTTP/2 flow control checks may count unprocessed data twice
  • 450636a: 8347274: Gatherers.mapConcurrent exhibits undesired behavior under variable delays, interruption, and finishing
  • 82e2a79: 8347006: LoadRangeNode floats above array guard in arraycopy intrinsic
  • 85ed78c: 8345185: Update jpackage to not include service bindings by default
  • 3b9732e: 8345471: Clean up compiler/intrinsics/sha/cli tests
  • ed0b555: 8344035: Replace predicate walking code in Loop Unswitching with a predicate visitor
  • b37f123: 8347407: [BACKOUT] C1/C2 don't handle allocation failure properly during initialization (RuntimeStub::new_runtime_stub fatal crash)
  • 1f7925c: 8347270: Remove unix_getParentPidAndTimings, unix_getChildren and unix_getCmdlineAndUserInfo
  • ... and 5 more: https://git.openjdk.org/jdk/compare/10f7142dce296fedbb4d945378473d44ecde34b7...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 13, 2025

@coleenp Pushed as commit cc19897.

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

@coleenp coleenp deleted the jvm-h branch January 13, 2025 13:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot [email protected] integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants