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

8289006: Cleanup from thread.hpp split #9252

Closed
wants to merge 2 commits into from

Conversation

coleenp
Copy link
Contributor

@coleenp coleenp commented Jun 22, 2022

Remove extra include directives. Tested with GHA.


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 pull/9252/head:pull/9252
$ git checkout pull/9252

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 9252

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

Using diff file

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

@coleenp
Copy link
Contributor Author

coleenp commented Jun 22, 2022

/test

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 22, 2022

👋 Welcome back coleenp! 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 22, 2022

@coleenp 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 hotspot hotspot-dev@openjdk.org label Jun 22, 2022
@coleenp coleenp marked this pull request as ready for review June 23, 2022 01:15
@openjdk openjdk bot added the rfr Pull request is ready for review label Jun 23, 2022
@mlbridge
Copy link

mlbridge bot commented Jun 23, 2022

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.

One pre-existing nit but your changes look good.

Thanks.

Comment on lines 31 to 32
#include "stack_zero.hpp"
#include "stack_zero.inline.hpp"
Copy link
Member

Choose a reason for hiding this comment

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

Existing, but it is redundant to include the .hpp and the .inline.hpp file as the later always includes the former.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You're right. I touched that line but didn't even see it. I confirmed stack_zero.inline.hpp includes stack_zero.hpp, so removed the latter from stack_zero.cpp. We'll let GHA confirm.

@openjdk
Copy link

openjdk bot commented Jun 23, 2022

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

8289006: Cleanup from thread.hpp split

Reviewed-by: dholmes, dcubed

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

  • 2728770: 8288589: Files.readString ignores encoding errors for UTF-16
  • ef17ee4: 8288515: (ch) Unnecessary use of Math.addExact() in java.nio.channels.FileLock.overlaps()
  • 72f286a: 8287580: (se) CancelledKeyException during channel registration
  • b8db0c3: 6980847: (fs) Files.copy needs to be "tuned"
  • d579916: 8288740: Change incorrect documentation for sjavac flag
  • 26c03c1: 8288719: [arm32] SafeFetch32 thumb interleaving causes random crashes
  • a802b98: 8287760: --do-not-resolve-by-default gets overwritten if --warn-if-resolved flags is used
  • bf0623b: 8286314: Trampoline not created for far runtime targets outside small CodeCache
  • 5b583e4: Merge
  • 6458ebc: 8288988: ProblemList serviceability/jvmti/vthread/ContStackDepthTest/ContStackDepthTest.java in -Xcomp mode
  • ... and 9 more: https://git.openjdk.org/jdk/compare/270cf67e5ff19b082f710d52831f436dd144d883...master

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 Pull request is ready to be integrated label Jun 23, 2022
Copy link
Member

@dcubed-ojdk dcubed-ojdk left a comment

Choose a reason for hiding this comment

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

Thumbs up. Thanks for taking care of my late comments.

@coleenp
Copy link
Contributor Author

coleenp commented Jun 23, 2022

Thanks Dan for the comments, and David for reviewing. Pushing as trivial.
/integrate

@openjdk
Copy link

openjdk bot commented Jun 23, 2022

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

  • 2728770: 8288589: Files.readString ignores encoding errors for UTF-16
  • ef17ee4: 8288515: (ch) Unnecessary use of Math.addExact() in java.nio.channels.FileLock.overlaps()
  • 72f286a: 8287580: (se) CancelledKeyException during channel registration
  • b8db0c3: 6980847: (fs) Files.copy needs to be "tuned"
  • d579916: 8288740: Change incorrect documentation for sjavac flag
  • 26c03c1: 8288719: [arm32] SafeFetch32 thumb interleaving causes random crashes
  • a802b98: 8287760: --do-not-resolve-by-default gets overwritten if --warn-if-resolved flags is used
  • bf0623b: 8286314: Trampoline not created for far runtime targets outside small CodeCache
  • 5b583e4: Merge
  • 6458ebc: 8288988: ProblemList serviceability/jvmti/vthread/ContStackDepthTest/ContStackDepthTest.java in -Xcomp mode
  • ... and 9 more: https://git.openjdk.org/jdk/compare/270cf67e5ff19b082f710d52831f436dd144d883...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 23, 2022

@coleenp Pushed as commit b206d2d.

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

@coleenp coleenp deleted the threadclean branch June 23, 2022 16:26
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.

3 participants