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

8272165: Consolidate mark_must_be_preserved() variants #5057

Closed
wants to merge 2 commits into from

Conversation

@rkennke
Copy link
Contributor

@rkennke rkennke commented Aug 9, 2021

We have markWord::mark_must_be_preserved() and markWord::mark_must_be_preserved_for_promotion_failure(). We used to have slightly different implementations when we had BiasedLocking, but now they are identical and used for identical purposes too. Let's remove what we don't need.

Testing:

  • hotspot_gc
  • tier1
  • tier2

Progress

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

Issue

  • JDK-8272165: Consolidate mark_must_be_preserved() variants

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 5057

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Aug 9, 2021

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

@rkennke
Copy link
Contributor Author

@rkennke rkennke commented Aug 9, 2021

/cc hotspot-gc

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Aug 9, 2021

@rkennke
The hotspot-gc label was successfully added.

Loading

@mlbridge
Copy link

@mlbridge mlbridge bot commented Aug 9, 2021

Webrevs

Loading

Copy link
Contributor

@tschatzl tschatzl left a comment

Lgtm and trivial removal.

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Aug 9, 2021

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

8272165: Consolidate mark_must_be_preserved() variants

Reviewed-by: tschatzl

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.

Loading

@openjdk openjdk bot added the ready label Aug 9, 2021
@rkennke
Copy link
Contributor Author

@rkennke rkennke commented Aug 19, 2021

/integrate

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Aug 19, 2021

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

  • ab41812: 8272576: G1: Use more accurate integer type for collection set length
  • 82b2f21: 8272579: G1: remove unnecesary null check for G1ParScanThreadStateSet::_states slots
  • 1c80f07: 8272334: com.sun.net.httpserver.HttpExchange: Improve API doc of getRequestHeaders
  • 6d3d479: 8272667: substandard error messages from the docs build
  • 73da66f: 8272318: Improve performance of HeapDumpAllTest
  • 96107e3: 8272573: Redundant unique_concrete_method_4 dependencies
  • 4d6593c: 8272124: Cgroup v1 initialization causes NullPointerException when cgroup path contains colon
  • 30b0f82: 8272626: Avoid C-style array declarations in java.*
  • e8f1219: 8271276: C2: Wrong JVM state used for receiver null check
  • 79a06df: 8272567: [IR Framework] Make AbstractInfo.getRandom() static
  • ... and 75 more: https://git.openjdk.java.net/jdk/compare/67869b491ae1eaf311dfb8c61a9e94329a822ffc...master

Your commit was automatically rebased without conflicts.

Loading

@openjdk openjdk bot closed this Aug 19, 2021
@openjdk openjdk bot added integrated and removed ready labels Aug 19, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Aug 19, 2021

@rkennke Pushed as commit 03b5e99.

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

Loading

@openjdk openjdk bot removed the rfr label Aug 19, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants