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

8260736: Shenandoah: Cleanup includes in ShenandoahGC and families #2339

Closed

Conversation

@zhengyu123
Copy link
Contributor

@zhengyu123 zhengyu123 commented Feb 1, 2021


Progress

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

Issue

  • JDK-8260736: Shenandoah: Cleanup includes in ShenandoahGC and families

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk pull/2339/head:pull/2339
$ git checkout pull/2339

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Feb 1, 2021

👋 Welcome back zgu! 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 openjdk bot commented Feb 1, 2021

@zhengyu123 The following labels will be automatically applied to this pull request:

  • hotspot-gc
  • shenandoah

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

@zhengyu123 zhengyu123 marked this pull request as ready for review Feb 1, 2021
@openjdk openjdk bot added the rfr label Feb 1, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Feb 1, 2021

Webrevs

Copy link
Contributor

@shipilev shipilev left a comment

Looks fine. But please pull from recent master to see if other #include work breaks these.

@openjdk
Copy link

@openjdk openjdk bot commented Feb 5, 2021

@zhengyu123 this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout JDK-8260736-cleanup-includes-gc
git fetch https://git.openjdk.java.net/jdk master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk
Copy link

@openjdk openjdk bot commented Feb 5, 2021

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

8260736: Shenandoah: Cleanup includes in ShenandoahGC and families

Reviewed-by: shade, rkennke

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 ready and removed merge-conflict labels Feb 5, 2021
rkennke
rkennke approved these changes Feb 5, 2021
Copy link
Contributor

@rkennke rkennke left a comment

Looks good to me! Thanks!

@zhengyu123
Copy link
Contributor Author

@zhengyu123 zhengyu123 commented Feb 5, 2021

/integrate

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

@openjdk openjdk bot commented Feb 5, 2021

@zhengyu123 Since your change was applied there have been 4 commits pushed to the master branch:

  • 4a89733: 8261198: [macOS] Incorrect JNI parameters in number conversion in A11Y code
  • 4a1814c: 8261179: Norwegian Bokmål Locale fallback issue
  • 0218917: 8258732: runtime/cds/appcds/dynamicArchive/DynamicArchiveRelocationTest.java fails
  • f9df366: 8242300: SystemDictionary::resolve_super_or_fail() should look for the super class first

Your commit was automatically rebased without conflicts.

Pushed as commit 7a6c176.

💡 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
3 participants