Skip to content

8355276: Sort C2 includes #25910

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Closed
wants to merge 2 commits into from

Conversation

mhaessig
Copy link
Contributor

@mhaessig mhaessig commented Jun 20, 2025

This PR sorts the includes in hotspot/share/opto using test/hotspot/jtreg/sources/SortIncludes.java and enforces sorted includes for C2 sources in sources/TestIncludesAreSorted.java.

Testing:

  • Github Actions
  • tier1,tier2 plus Oracle internal testing on Oracle supported platforms

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

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 25910

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 20, 2025

👋 Welcome back mhaessig! 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 Jun 20, 2025

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

8355276: Sort C2 includes

Reviewed-by: kvn, thartmann

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 11 new commits pushed to 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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@vnkozlov, @TobiHartmann) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the rfr Pull request is ready for review label Jun 20, 2025
@openjdk
Copy link

openjdk bot commented Jun 20, 2025

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

  • graal
  • hotspot-compiler

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 graal graal-dev@openjdk.org hotspot-compiler hotspot-compiler-dev@openjdk.org labels Jun 20, 2025
@mlbridge
Copy link

mlbridge bot commented Jun 20, 2025

Webrevs

@shipilev
Copy link
Member

Oh, great, Windows GHA is apparently failing out with MSVC 14.43 and new runner image. I guess there is no choice but to switch to 14.44 now :) #25912. Wait until GHA is stable again, so to check that MSVC accepts the include order correctly?

@mhaessig
Copy link
Contributor Author

On our internal testing, Windows built and tested fine. I just kicked GHA to rerun the failed Windows builds, which fixed the problem for other runs yesterday.

@mhaessig
Copy link
Contributor Author

Everything passed now.

Copy link
Contributor

@vnkozlov vnkozlov 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.

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

@TobiHartmann TobiHartmann 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 to me. Thanks for fixing this!

@mhaessig
Copy link
Contributor Author

Thank you for your reviews!

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Jun 23, 2025
@openjdk
Copy link

openjdk bot commented Jun 23, 2025

@mhaessig
Your change (at version 83e2a18) is now ready to be sponsored by a Committer.

@TobiHartmann
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Jun 23, 2025

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

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 23, 2025

@TobiHartmann @mhaessig Pushed as commit 9ae39b6.

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

# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
graal graal-dev@openjdk.org hotspot-compiler hotspot-compiler-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

4 participants