Skip to content

8360474: Add missing include guards for some HotSpot headers #25968

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

Closed
wants to merge 3 commits into from

Conversation

MaxXSoft
Copy link
Member

@MaxXSoft MaxXSoft commented Jun 25, 2025

Some HotSpot header files are missing include guards, which may cause compilation errors if these files are included multiple times. This patch adds include guards for them.


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-8360474: Add missing include guards for some HotSpot headers (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 25968

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

Using diff file

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

Using Webrev

Link to Webrev Comment

Verified

This commit was signed with the committer’s verified signature.
MaxXSoft MaxXing
@bridgekeeper
Copy link

bridgekeeper bot commented Jun 25, 2025

👋 Welcome back qxing! 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 25, 2025

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

8360474: Add missing include guards for some HotSpot headers

Reviewed-by: mhaessig, stefank, dholmes

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 32 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 (@dholmes-ora, @mhaessig, @stefank) 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
Copy link

openjdk bot commented Jun 25, 2025

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

Verified

This commit was signed with the committer’s verified signature.
MaxXSoft MaxXing
@openjdk openjdk bot added the rfr Pull request is ready for review label Jun 25, 2025
@mlbridge
Copy link

mlbridge bot commented Jun 25, 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.

That looks fine to me.

Thanks

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

@mhaessig mhaessig left a comment

Choose a reason for hiding this comment

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

Good catch! Thank you for fixing this.

Looks good to me!

Comment on lines 50 to 51
#endif // OS_AIX_DECODER_AIX_HPP

Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
#endif // OS_AIX_DECODER_AIX_HPP
#endif // OS_AIX_DECODER_AIX_HPP

Copy link
Member

Choose a reason for hiding this comment

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

It looks like there's an extra blankline here (at least in the GitHub view)

Copy link
Member Author

Choose a reason for hiding this comment

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

Got it, I removed the extra trailing new line.

Verified

This commit was signed with the committer’s verified signature.
MaxXSoft MaxXing
@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Jun 25, 2025
@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jun 25, 2025
@@ -22,6 +22,9 @@
*
*/

#ifndef SHARE_UTILITIES_PACKEDTABLE_HPP
#define SHARE_UTILITIES_PACKEDTABLE_HPP

Copy link
Contributor

Choose a reason for hiding this comment

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

I just backported this to JDK 25. I wonder if you should omit this change and put it under another CR so we can backport that too. Or not backport this, assuming that JDK 25 will never have double inclusions of this file ?

Copy link
Member Author

Choose a reason for hiding this comment

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

Can I backport the entire PR to JDK 25 instead of splitting it up? I noticed that all the changes can be applied to JDK 25 as well.

@MaxXSoft
Copy link
Member Author

@dholmes-ora @mhaessig @stefank @coleenp Thanks for the review!

/integrate

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

openjdk bot commented Jun 27, 2025

@MaxXSoft
Your change (at version 75d90ef) is now ready to be sponsored by a Committer.

@stefank
Copy link
Member

stefank commented Jun 27, 2025

I don't think this needs to be backported and if it does we can backport the entire patch (or split out the necessary parts). I'll sponsor this.
/sponsor

@openjdk
Copy link

openjdk bot commented Jun 27, 2025

Going to push as commit aa26ced.
Since your change was applied there have been 33 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 27, 2025
@openjdk openjdk bot closed this Jun 27, 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 27, 2025
@openjdk
Copy link

openjdk bot commented Jun 27, 2025

@stefank @MaxXSoft Pushed as commit aa26ced.

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

@MaxXSoft
Copy link
Member Author

I don't think this needs to be backported and if it does we can backport the entire patch (or split out the necessary parts). I'll sponsor this. /sponsor

Got it, thank you!

@MaxXSoft MaxXSoft deleted the fix-include-guard branch June 27, 2025 08:24
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.

None yet

5 participants