-
Notifications
You must be signed in to change notification settings - Fork 6.1k
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
Conversation
👋 Welcome back qxing! A progress list of the required criteria for merging this PR into |
@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:
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
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 |
Webrevs
|
There was a problem hiding this 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
There was a problem hiding this 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!
src/hotspot/os/aix/decoder_aix.hpp
Outdated
#endif // OS_AIX_DECODER_AIX_HPP | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
#endif // OS_AIX_DECODER_AIX_HPP | |
#endif // OS_AIX_DECODER_AIX_HPP |
There was a problem hiding this comment.
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)
There was a problem hiding this comment.
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.
@@ -22,6 +22,9 @@ | |||
* | |||
*/ | |||
|
|||
#ifndef SHARE_UTILITIES_PACKEDTABLE_HPP | |||
#define SHARE_UTILITIES_PACKEDTABLE_HPP | |||
|
There was a problem hiding this comment.
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 ?
There was a problem hiding this comment.
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.
@dholmes-ora @mhaessig @stefank @coleenp Thanks for the review! /integrate |
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. |
Going to push as commit aa26ced.
Your commit was automatically rebased without conflicts. |
Got it, thank you! |
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
Issue
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