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

8275004: CDS build failure with gcc11 #5880

Closed
wants to merge 2 commits into from

Conversation

DamonFool
Copy link
Member

@DamonFool DamonFool commented Oct 10, 2021

Hi all,

Please review this trivial change which fix the build failure with gcc11.

Thanks.
Best regards,
Jie


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/5880/head:pull/5880
$ git checkout pull/5880

Update a local copy of the PR:
$ git checkout pull/5880
$ git pull https://git.openjdk.java.net/jdk pull/5880/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 5880

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/5880.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Oct 10, 2021

👋 Welcome back jiefu! 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 openjdk bot added the rfr label Oct 10, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Oct 10, 2021

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

  • hotspot-runtime

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 hotspot-runtime label Oct 10, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Oct 10, 2021

Webrevs

Copy link
Contributor

@shipilev shipilev left a comment

No, wait, you want to #include "utilities/globalDefinitions.hpp" instead, I think.

@DamonFool
Copy link
Member Author

@DamonFool DamonFool commented Oct 10, 2021

#include "utilities/globalDefinitions.hpp"

Thanks @shipilev for your review.

I think <cstddef> is enough since the failure was caused by undefined size_t.
Why globalDefinitions.hpp is better here?
Thanks.

@shipilev
Copy link
Contributor

@shipilev shipilev commented Oct 10, 2021

I think <cstddef> is enough since the failure was caused by undefined size_t. Why globalDefinitions.hpp is better here?

I believe it is a good style to avoid including standard headers directly.

While Hotspot Style Guide permits using cstddef directly for std::nullptr_t, it does not directly allow it for size_t (if we follow this rule exactly). Moreover, it suggests to use a hotspot header even for the allowed cases. There is the only case of std::nullptr_t use in oopsHierarchy.hpp, and it still includes cstddef through globalDefinitions.hpp. Therefore it is reasonable to do the same here.

(Also, includes should be in alphabetic order, if you change it).

@DamonFool
Copy link
Member Author

@DamonFool DamonFool commented Oct 10, 2021

I think <cstddef> is enough since the failure was caused by undefined size_t. Why globalDefinitions.hpp is better here?

I believe it is a good style to avoid including standard headers directly.

While Hotspot Style Guide permits using cstddef directly for std::nullptr_t, it does not directly allow it for size_t (if we follow this rule exactly). Moreover, it suggests to use a hotspot header even for the allowed cases. There is the only case of std::nullptr_t use in oopsHierarchy.hpp, and it still includes cstddef through globalDefinitions.hpp. Therefore it is reasonable to do the same here.

(Also, includes should be in alphabetic order, if you change it).

Got it.
Thanks for your explanation.

Updated.
Thanks.

Copy link
Contributor

@shipilev shipilev left a comment

Looks good to me. I think this is trivial, and can go in, as long as GHA checks are happy.

@openjdk
Copy link

@openjdk openjdk bot commented Oct 10, 2021

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

8275004: CDS build failure with gcc11

Reviewed-by: shade

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

  • 296f853: 8274029: Remove jtreg tag manual=yesno for java/awt/print/Dialog/DialogOrient.java
  • 2c83559: 8274882: Cleanup redundant boxing in java.desktop

Please see this link for an up-to-date comparison between the source branch of this pull request and 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 ready label Oct 10, 2021
@DamonFool
Copy link
Member Author

@DamonFool DamonFool commented Oct 10, 2021

GHA checks

All GHA checks passed.
So let's integrate it.
Thanks.

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Oct 10, 2021

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

  • 296f853: 8274029: Remove jtreg tag manual=yesno for java/awt/print/Dialog/DialogOrient.java
  • 2c83559: 8274882: Cleanup redundant boxing in java.desktop

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Oct 10, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Oct 10, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Oct 10, 2021

@DamonFool Pushed as commit 2ff3977.

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

@DamonFool DamonFool deleted the JDK-8275004 branch Oct 10, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-runtime integrated
2 participants