Skip to content

Conversation

@shipilev
Copy link
Member

@shipilev shipilev commented Jun 28, 2021

This fixes -XX:+CheckUnhandledOops verification code.

Additional testing:

  • New test fails without the patch, passes with it
  • Linux x86_64 fastdebug tier1 with -XX:+CheckUnhandledOops
  • Linux x86_64 fastdebug tier2 with -XX:+CheckUnhandledOops

Progress

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

Issue

  • JDK-8227766: CheckUnhandledOops is broken in MemAllocator

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/73/head:pull/73
$ git checkout pull/73

Update a local copy of the PR:
$ git checkout pull/73
$ git pull https://git.openjdk.java.net/jdk11u-dev pull/73/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 73

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/73.diff

Save oop created in handle more eagerly, so CheckUnhandledOops doesn't bash it.

Reviewed-by: lfoltan, eosterlund
@bridgekeeper
Copy link

bridgekeeper bot commented Jun 28, 2021

👋 Welcome back shade! 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 changed the title Backport d35c1540e65de22c970e9202c76b65fba30eaa0d 8227766: CheckUnhandledOops is broken in MemAllocator Jun 28, 2021
@openjdk
Copy link

openjdk bot commented Jun 28, 2021

This backport pull request has now been updated with issue and summary from the original commit.

@openjdk openjdk bot added backport Port of a pull request already in a different code base rfr Pull request is ready for review labels Jun 28, 2021
@mlbridge
Copy link

mlbridge bot commented Jun 28, 2021

Webrevs

Copy link
Member

@phohensee phohensee left a comment

Choose a reason for hiding this comment

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

Lgtm.

@openjdk
Copy link

openjdk bot commented Jun 30, 2021

@shipilev This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8227766: CheckUnhandledOops is broken in MemAllocator

Save oop created in handle more eagerly, so CheckUnhandledOops doesn't bash it.

Reviewed-by: phh

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 17 new commits pushed to 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 Pull request is ready to be integrated label Jun 30, 2021
@shipilev
Copy link
Member Author

shipilev commented Jul 1, 2021

Lgtm.

Thank you, tagged for approval.

@shipilev
Copy link
Member Author

shipilev commented Jul 5, 2021

/integrate

@openjdk
Copy link

openjdk bot commented Jul 5, 2021

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

  • fdaa4f0: 8255810: Zero: build fails without JVMTI
  • 3f03476: 8224853: CDS address sanitizer errors
  • 65b215a: 8259338: Add expiry exception for identrustdstx3 alias to VerifyCACerts.java test
  • c61cfb5: 8255718: Zero: VM should know it runs in interpreter-only mode
  • 3e09f94: 8260923: Add more tests for SSLSocket input/output shutdown
  • c00a72f: 8253631: Remove unimplemented CompileBroker methods after JEP-165
  • 21345ef: 8269847: JDK-8269594 backport breaks 11u builds
  • 73e987c: 8269594: assert(_handle_mark_nesting > 1) failed: memory leak: allocating handle outside HandleMark
  • 71f793e: 8266404: Fatal error report generated with -XX:+CrashOnOutOfMemoryError should not contain suggestion to submit a bug report
  • e56abca: 8268366: Incorrect calculation of has_fpu_registers in C1 linear scan
  • ... and 22 more: https://git.openjdk.java.net/jdk11u-dev/compare/df587c75bb436b40dd995e39ee0ed952a74b979b...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Jul 5, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jul 5, 2021
@openjdk
Copy link

openjdk bot commented Jul 5, 2021

@shipilev Pushed as commit d07f6d9.

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

@shipilev shipilev deleted the JDK-8227766 branch July 5, 2021 09:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Port of a pull request already in a different code base integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

2 participants