-
Notifications
You must be signed in to change notification settings - Fork 5.6k
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
8322815: Eliminate -Wparentheses warnings in shenandoah code #17214
Conversation
👋 Welcome back kbarrett! A progress list of the required criteria for merging this PR into |
@kimbarrett The following labels will be automatically applied to this pull request:
When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command. |
@@ -707,7 +707,7 @@ void ShenandoahEvacUpdateCleanupOopStorageRootsClosure::do_oop(oop* p) { | |||
} | |||
ShenandoahHeap::atomic_update_oop(resolved, p, obj); | |||
assert(_heap->cancelled_gc() || | |||
_mark_context->is_marked(resolved) && !_heap->in_collection_set(resolved), | |||
(_mark_context->is_marked(resolved) && !_heap->in_collection_set(resolved)), |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The change for this PR seems fine, but the whole assert looks weird, and lacks richer diagnostics Shenandoah asserts do. I believe the forwardee is explicitly marked, given it is a new copy after TAMS. So the whole thing might be just:
shenandoah_assert_not_in_cset_except(p, resolved, _heap->cancelled_gc());
Right, @zhengyu123? We should do that in separate PR.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Doing this in #17245. @kimbarrett, feel free to drop this hunk from the patch, that PR is going to rewrite the assert
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks. Removed as part of merge conflict resolution.
@kimbarrett 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:
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 ➡️ To integrate this PR with the above commit message to the |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Thanks for reviews @shipilev and @zhengyu123 . |
/integrate |
Going to push as commit 3560e68. |
@kimbarrett Pushed as commit 3560e68. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
8322815: Eliminate -Wparentheses warnings in shenandoah code
Please review this change to eliminate some -Wparentheses warnings. This
involved simply adding a few parentheses to make some implicit operator
precedence explicit.
Testing: local (linux-x64) build with shenandoah included and ran
hotspot:tier1 with -XX:+UseShenandoahGC.
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/17214/head:pull/17214
$ git checkout pull/17214
Update a local copy of the PR:
$ git checkout pull/17214
$ git pull https://git.openjdk.org/jdk.git pull/17214/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 17214
View PR using the GUI difftool:
$ git pr show -t 17214
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/17214.diff
Webrev
Link to Webrev Comment