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

8264196: Change link_and_cleanup_shared_classes(CATCH) to CHECK #3640

Conversation

@calvinccheung
Copy link
Member

@calvinccheung calvinccheung commented Apr 22, 2021

Please review this simple fix for passing in CHECK instead of CATCH when calling link_and_cleanup_shared_classes() since it could throw an exception.

Testing: tiers 1 and 2 on mach5.


Progress

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

Issue

  • JDK-8264196: Change link_and_cleanup_shared_classes(CATCH) to CHECK

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3640

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Apr 22, 2021

👋 Welcome back ccheung! 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.

Loading

@calvinccheung
Copy link
Member Author

@calvinccheung calvinccheung commented Apr 22, 2021

/label add hotspot-runtime

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Apr 22, 2021

@calvinccheung
The hotspot-runtime label was successfully added.

Loading

@calvinccheung calvinccheung marked this pull request as ready for review Apr 22, 2021
@openjdk openjdk bot added the rfr label Apr 22, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Apr 22, 2021

Webrevs

Loading

yminqi
yminqi approved these changes Apr 22, 2021
Copy link
Contributor

@yminqi yminqi left a comment

LGTM

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Apr 22, 2021

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

8264196: Change link_and_cleanup_shared_classes(CATCH) to CHECK

Reviewed-by: minqi, iklam

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

  • 0e00598: 8265782: Bump bootjdk to jdk-17+19 on macosx-aarch64 at Oracle
  • e81baea: 8265786: ProblemList serviceability/sa/sadebugd/DisableRegistryTest.java on ZGC
  • ca0de26: 8265699: (bf) Scopes passed to ScopedMemoryAccess.copy[Swap]Memory in incorrect order
  • b930bb1: 8265461: G1: Forwarding pointer removal thread sizing
  • f834557: 8258915: Temporary buffer cleanup
  • 31d8a19: 8265105: gc/arguments/TestSelectDefaultGC.java fails when compiler1 is disabled

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.

Loading

@openjdk openjdk bot added the ready label Apr 22, 2021
iklam
iklam approved these changes Apr 22, 2021
Copy link
Member

@iklam iklam left a comment

Looks good and trivial.

Loading

@calvinccheung
Copy link
Member Author

@calvinccheung calvinccheung commented Apr 22, 2021

@yminqi, @iklam, thanks for your quick review.

Loading

@calvinccheung
Copy link
Member Author

@calvinccheung calvinccheung commented Apr 22, 2021

/integrate

Loading

@openjdk openjdk bot closed this Apr 22, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Apr 22, 2021
@calvinccheung calvinccheung deleted the 8264196-link-and-cleanup-shared-classes branch Apr 22, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Apr 22, 2021

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

  • b84f690: 8265793: Remove duplicate jtreg TEST.groups references for some client tests
  • 0e00598: 8265782: Bump bootjdk to jdk-17+19 on macosx-aarch64 at Oracle
  • e81baea: 8265786: ProblemList serviceability/sa/sadebugd/DisableRegistryTest.java on ZGC
  • ca0de26: 8265699: (bf) Scopes passed to ScopedMemoryAccess.copy[Swap]Memory in incorrect order
  • b930bb1: 8265461: G1: Forwarding pointer removal thread sizing
  • f834557: 8258915: Temporary buffer cleanup
  • 31d8a19: 8265105: gc/arguments/TestSelectDefaultGC.java fails when compiler1 is disabled

Your commit was automatically rebased without conflicts.

Pushed as commit 7a55914.

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

Loading

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 participants