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

8293353: [BACKOUT] G1: Remove redundant is-marking-active checks in C1 barrier #10159

Closed
wants to merge 1 commit into from

Conversation

albertnetymk
Copy link
Member

@albertnetymk albertnetymk commented Sep 5, 2022

Clean revert of JDK-8289138 to keep CI clean.

Test: ~2/200 failing rate before the PR and pass after the PR.


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

  • JDK-8293353: [BACKOUT] G1: Remove redundant is-marking-active checks in C1 barrier

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/10159/head:pull/10159
$ git checkout pull/10159

Update a local copy of the PR:
$ git checkout pull/10159
$ git pull https://git.openjdk.org/jdk pull/10159/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 10159

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/10159.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 5, 2022

👋 Welcome back ayang! 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 8293353 8293353: [BACKOUT] G1: Remove redundant is-marking-active checks in C1 barrier Sep 5, 2022
Copy link

@kimbarrett kimbarrett left a comment

Choose a reason for hiding this comment

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

Looks good.

@openjdk openjdk bot added the rfr Pull request is ready for review label Sep 5, 2022
@openjdk
Copy link

openjdk bot commented Sep 5, 2022

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

8293353: [BACKOUT] G1: Remove redundant is-marking-active checks in C1 barrier

Reviewed-by: kbarrett, mdoerr, 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 5 new commits pushed to the master branch:

  • 48b3ab0: 8293167: Memory leak in JfrThreadSampler if stackdepth is larger than default (64)
  • 4067321: 8291586: Broken links in JVMTI specification
  • 32f4dc8: 8293295: Add type check asserts to java_lang_ref_Reference accessors
  • e945619: 8293088: Fix compilation with the new Visual Studio preprocessor
  • 730ced9: 8292660: C2: blocks made unreachable by NeverBranch-to-Goto conversion are removed incorrectly

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 Sep 5, 2022
@openjdk
Copy link

openjdk bot commented Sep 5, 2022

@albertnetymk The following label will be automatically applied to this pull request:

  • hotspot

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

@openjdk openjdk bot added the hotspot hotspot-dev@openjdk.org label Sep 5, 2022
@mlbridge
Copy link

mlbridge bot commented Sep 5, 2022

Webrevs

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.

mem2reg with patching in G1BarrierSetAssembler::gen_pre_barrier_stub contains a safepoint. Rechecking is needed in this case.

@albertnetymk
Copy link
Member Author

Thanks for the review.

/integrate

@openjdk
Copy link

openjdk bot commented Sep 6, 2022

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

  • 4955835: 8282434: Leading combining diacritic character in string renders incorrectly
  • ef20ffe: 8293159: Use try-with-resources in X11FontManager.registerFontDir
  • 056ed48: 8293180: JQuery UI license file not updated
  • dbb2c4b: 8288897: Clean up node dump code
  • 9833c02: 8292946: GC lock/jni/jnilock001 test failed "assert(gch->gc_cause() == GCCause::_scavenge_alot || !gch->incremental_collection_failed()) failed: Twice in a row"
  • d753658: 8293107: GHA: Bump to Ubuntu 22.04
  • d4e3e69: 8293344: JDK-8242181 broke stack printing for non-attached threads
  • 2c61efe: 8282648: Weaken the InflaterInputStream specification in order to allow faster Zip implementations
  • e31c537: 8293224: Add link to openjdk.org/jtreg/ from doc/testing
  • 955baa3: 8267374: macOS: Option+Up/Down Arrow don't traverse to beginning/end of line in JTextArea
  • ... and 7 more: https://git.openjdk.org/jdk/compare/3464019d7e8fe57adc910339c00ba79884c77852...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Sep 6, 2022

@albertnetymk Pushed as commit 1bed23a.

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

@albertnetymk albertnetymk deleted the g1-c1-revert branch September 6, 2022 08:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot hotspot-dev@openjdk.org integrated Pull request has been integrated
4 participants