Skip to content

8373599: Cleanup arguments.hpp includes#28791

Closed
stefank wants to merge 2 commits intoopenjdk:masterfrom
stefank:8373599_arguments_includes
Closed

8373599: Cleanup arguments.hpp includes#28791
stefank wants to merge 2 commits intoopenjdk:masterfrom
stefank:8373599_arguments_includes

Conversation

@stefank
Copy link
Member

@stefank stefank commented Dec 12, 2025

In the Valhalla project we are considering using a property in Arguments to figure out if Valhalla is enabled. To minimize transitive-include-proliferation if this property ever needs to be checked in a header I propose that we clean up the header includes in arguments.hpp.

I'm opening the review for this so that I can get opinions on the move of functions. I'm going to compile this on all our platforms and will likely add a few more includes when unrelated files fail to compile because they relied on the includes provided through by java.hpp and arguments.hpp.


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-8373599: Cleanup arguments.hpp includes (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 28791

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 12, 2025

👋 Welcome back stefank! 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 Dec 12, 2025

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

8373599: Cleanup arguments.hpp includes

Reviewed-by: coleenp, kbarrett

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 27 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.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the hotspot hotspot-dev@openjdk.org label Dec 12, 2025
@openjdk
Copy link

openjdk bot commented Dec 12, 2025

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

@openjdk openjdk bot added the rfr Pull request is ready for review label Dec 12, 2025
@mlbridge
Copy link

mlbridge bot commented Dec 12, 2025

Webrevs

Copy link
Contributor

@coleenp coleenp left a comment

Choose a reason for hiding this comment

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

This looks good, pending all the platforms building. Thanks!

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Dec 12, 2025
@iklam
Copy link
Member

iklam commented Dec 12, 2025

I think this clean up is good by itself.

However, do you plan to include arguments.hpp in a lot of files (including files) just to check if valhalla is enabled?

If that's the case, I think it's better to move the check into its own header, similar to existing files like cdsConfig.hpp and gcConfig.hpp. Maybe valueTypeConfig.hpp?

@coleenp
Copy link
Contributor

coleenp commented Dec 12, 2025

Let's see how many files end up with enable_valhalla() first, then decide, after @Arraying work on https://bugs.openjdk.org/browse/JDK-8371357.

@Arraying
Copy link
Member

Let's see how many files end up with enable_valhalla() first, then decide, after @Arraying work on https://bugs.openjdk.org/browse/JDK-8371357.

As of right now 37 non-test files have is_valhalla_enabled() and 26 new #include "runtime/arguments.hpp if I scripted correctly. I don't anticipate those numbers changing much until integration.

@stefank
Copy link
Member Author

stefank commented Dec 12, 2025

I think this clean up is good by itself.

However, do you plan to include arguments.hpp in a lot of files (including files) just to check if valhalla is enabled?

If that's the case, I think it's better to move the check into its own header, similar to existing files like cdsConfig.hpp and gcConfig.hpp. Maybe valueTypeConfig.hpp?

That would also be fine by me. Maybe we can bring that question over to the Valhalla PR:
openjdk/valhalla#1759

@dholmes-ora
Copy link
Member

dholmes-ora commented Dec 15, 2025

Removed comment that needs discussing in the Valhalla PR.

@stefank
Copy link
Member Author

stefank commented Dec 15, 2025

Anyone else wants to put the second reviewer stamp on this?

Copy link

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

@stefank
Copy link
Member Author

stefank commented Dec 15, 2025

Thanks for the reviews!
/integrate

@openjdk
Copy link

openjdk bot commented Dec 15, 2025

Going to push as commit f5187eb.
Since your change was applied there have been 27 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 Dec 15, 2025
@openjdk openjdk bot closed this Dec 15, 2025
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Dec 15, 2025
@openjdk
Copy link

openjdk bot commented Dec 15, 2025

@stefank Pushed as commit f5187eb.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

hotspot hotspot-dev@openjdk.org integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

6 participants