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

8322815: Eliminate -Wparentheses warnings in shenandoah code #17214

Closed
wants to merge 2 commits into from

Conversation

kimbarrett
Copy link

@kimbarrett kimbarrett commented Jan 2, 2024

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

  • 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-8322815: Eliminate -Wparentheses warnings in shenandoah code (Enhancement - P4)

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 2, 2024

👋 Welcome back kbarrett! 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 added the rfr Pull request is ready for review label Jan 2, 2024
@openjdk
Copy link

openjdk bot commented Jan 2, 2024

@kimbarrett The following labels will be automatically applied to this pull request:

  • hotspot-gc
  • shenandoah

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.

@openjdk openjdk bot added hotspot-gc hotspot-gc-dev@openjdk.org shenandoah shenandoah-dev@openjdk.org labels Jan 2, 2024
@mlbridge
Copy link

mlbridge bot commented Jan 2, 2024

Webrevs

@@ -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)),
Copy link
Member

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.

Copy link
Member

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

Copy link
Author

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.

@openjdk
Copy link

openjdk bot commented Jan 3, 2024

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

8322815: Eliminate -Wparentheses warnings in shenandoah code

Reviewed-by: shade, zgu

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.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jan 3, 2024
Copy link
Contributor

@zhengyu123 zhengyu123 left a comment

Choose a reason for hiding this comment

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

LGTM

@kimbarrett
Copy link
Author

Thanks for reviews @shipilev and @zhengyu123 .

@kimbarrett
Copy link
Author

/integrate

@openjdk
Copy link

openjdk bot commented Jan 8, 2024

Going to push as commit 3560e68.

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

openjdk bot commented Jan 8, 2024

@kimbarrett Pushed as commit 3560e68.

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

@kimbarrett kimbarrett deleted the shenandoah-wparentheses branch January 8, 2024 02:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-gc hotspot-gc-dev@openjdk.org integrated Pull request has been integrated shenandoah shenandoah-dev@openjdk.org
Development

Successfully merging this pull request may close these issues.

3 participants