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

8242115: C2 SATB barriers are not safepoint-safe #999

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Dec 29, 2022

I backport this for parity with 17.0.7-oracle.

I had to resolve memnode.hpp and added control_dependency()
which is called by this change.


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/jdk17u-dev pull/999/head:pull/999
$ git checkout pull/999

Update a local copy of the PR:
$ git checkout pull/999
$ git pull https://git.openjdk.org/jdk17u-dev pull/999/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 999

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk17u-dev/pull/999.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 29, 2022

👋 Welcome back goetz! 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 c6e3daa5fa0bdbe70e5bb63302bbce1abc5453fe 8242115: C2 SATB barriers are not safepoint-safe Dec 29, 2022
@openjdk
Copy link

openjdk bot commented Dec 29, 2022

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

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Dec 29, 2022
@mlbridge
Copy link

mlbridge bot commented Dec 29, 2022

Webrevs

@GoeLin
Copy link
Member Author

GoeLin commented Dec 30, 2022

Pre-submit failure: Couldn't download packages: libmnl0, infra issue, unrelated.

Copy link
Contributor

@TheRealMDoerr TheRealMDoerr left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks for backporting!

@openjdk
Copy link

openjdk bot commented Dec 30, 2022

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

8242115: C2 SATB barriers are not safepoint-safe

Reviewed-by: mdoerr

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

  • 633a763: 8297959: Provide better descriptions for some Operating System JFR events
  • c0a3bf1: 8297480: GetPrimitiveArrayCritical in imageioJPEG misses result - NULL check
  • cec5a0c: 8288854: getLocalGraphicsEnvironment() on for multi-screen setups throws exception NPE
  • 838ca6a: 8296548: Improve MD5 intrinsic for x86_64

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.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Dec 30, 2022
@GoeLin
Copy link
Member Author

GoeLin commented Jan 2, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Jan 2, 2023

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

  • 0aa62ae: 8294378: URLPermission constructor exception when using tr locale
  • 6f5fdb3: 8296239: ISO 4217 Amendment 174 Update
  • 9a2743f: 8296136: Use correct register in aarch64_enc_fast_unlock()
  • 7be0b5a: 8293531: C2: some vectorapi tests fail assert "Not monotonic" with flag -XX:TypeProfileLevel=222
  • aa8a841: 8290964: C2 compilation fails with assert "non-reduction loop contains reduction nodes"
  • 61e27b4: 8292780: misc tests failed "assert(false) failed: graph should be schedulable"
  • 43668f9: 8293996: C2: fix and simplify IdealLoopTree::do_remove_empty_loop
  • 330105c: 8292602: ZGC: C2 late barrier analysis uses invalid dominator information
  • 4be52ee: 8292297: Fix up loading of override java.security properties file
  • 475ca04: 8281122: [IR Framework] Cleanup IR matching code in preparation for JDK-8280378
  • ... and 11 more: https://git.openjdk.org/jdk17u-dev/compare/6042c6b9bbacbff1bd47f087f0f19646a20eef97...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 2, 2023

@GoeLin Pushed as commit abfa08f.

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

@GoeLin GoeLin deleted the goetz_backport_8242115 branch January 2, 2023 21:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
2 participants