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

8314274: G1: Fix -Wconversion warnings around G1CardSetArray::_data #15289

Closed
wants to merge 2 commits into from

Conversation

albertnetymk
Copy link
Member

@albertnetymk albertnetymk commented Aug 15, 2023

Add value-range check and explicit type conversion. The second write has its check at the beginning of the method, so doesn't require an assertion.


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-8314274: G1: Fix -Wconversion warnings around G1CardSetArray::_data (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 15289

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 15, 2023

👋 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 8314274 8314274: G1: Fix -Wconversion warnings around G1CardSetArray::_data Aug 15, 2023
@openjdk openjdk bot added the rfr Pull request is ready for review label Aug 15, 2023
@openjdk
Copy link

openjdk bot commented Aug 15, 2023

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

  • hotspot-gc

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-gc hotspot-gc-dev@openjdk.org label Aug 15, 2023
@mlbridge
Copy link

mlbridge bot commented Aug 15, 2023

Webrevs

@@ -144,7 +144,8 @@ inline G1CardSetArray::G1CardSetArray(uint card_in_region, EntryCountType num_ca
_num_entries(1) {
assert(_size > 0, "CardSetArray of size 0 not supported.");
assert(_size < LockBitMask, "Only support CardSetArray of size %u or smaller.", LockBitMask - 1);
_data[0] = card_in_region;
assert(card_in_region < (1u << sizeof(_data[0]) * BitsPerByte), "in-range");
_data[0] = static_cast<EntryDataType>(card_in_region);

Choose a reason for hiding this comment

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

Shouldn't this be checked_cast rather than static_cast?

@@ -195,7 +196,7 @@ inline G1AddCardResult G1CardSetArray::add(uint card_idx) {
return Overflow;
}

_data[num_entries] = card_idx;
_data[num_entries] = static_cast<EntryDataType>(card_idx);

Choose a reason for hiding this comment

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

Shouldn't this be checked_cast rather than static_cast?

@openjdk
Copy link

openjdk bot commented Aug 16, 2023

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

8314274: G1: Fix -Wconversion warnings around G1CardSetArray::_data

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

  • 20e9478: 8314426: runtime/os/TestTrimNative.java is failing on slow machines
  • 69d900d: 8314730: GHA: Drop libfreetype6-dev transitional package in favor of libfreetype-dev
  • f39fc0a: 8314738: Remove all occurrences of and support for @Revised
  • 6b9df03: 8311240: Eliminate usage of testcases.jar from TestMetaSpaceLog.java
  • 3e1b1bf: 8314688: VM build without C1 fails after JDK-8313372
  • 02ef859: 8313689: C2: compiler/c2/irTests/scalarReplacement/AllocationMergesTests.java fails intermittently with -XX:-TieredCompilation
  • ab86d23: 8250269: Replace ATTRIBUTE_ALIGNED with alignas
  • a66b5df: 8314618: RISC-V: -XX:MaxVectorSize does not work as expected
  • 87298d2: 8312535: MidiSystem.getSoundbank() throws unexpected SecurityException
  • 78f74bc: 8314672: ProblemList runtime/cds/appcds/customLoader/HelloCustom_JFR.java on linux-all and windows-x64
  • ... and 74 more: https://git.openjdk.org/jdk/compare/6338927221ee82a556b55ccf79239acb2ac9729a...master

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 Aug 16, 2023
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.

Change looks good.

One of us is going to need to deal with the interaction between this and https://git.openjdk.org/jdk/pull/15377

@albertnetymk
Copy link
Member Author

Thanks for the review.

/integrate

@openjdk
Copy link

openjdk bot commented Aug 22, 2023

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

  • eb06572: 8313408: Use SVG for BoxLayout example
  • 20e9478: 8314426: runtime/os/TestTrimNative.java is failing on slow machines
  • 69d900d: 8314730: GHA: Drop libfreetype6-dev transitional package in favor of libfreetype-dev
  • f39fc0a: 8314738: Remove all occurrences of and support for @Revised
  • 6b9df03: 8311240: Eliminate usage of testcases.jar from TestMetaSpaceLog.java
  • 3e1b1bf: 8314688: VM build without C1 fails after JDK-8313372
  • 02ef859: 8313689: C2: compiler/c2/irTests/scalarReplacement/AllocationMergesTests.java fails intermittently with -XX:-TieredCompilation
  • ab86d23: 8250269: Replace ATTRIBUTE_ALIGNED with alignas
  • a66b5df: 8314618: RISC-V: -XX:MaxVectorSize does not work as expected
  • 87298d2: 8312535: MidiSystem.getSoundbank() throws unexpected SecurityException
  • ... and 75 more: https://git.openjdk.org/jdk/compare/6338927221ee82a556b55ccf79239acb2ac9729a...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 22, 2023

@albertnetymk Pushed as commit 32bf468.

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

@albertnetymk albertnetymk deleted the g1-remset-data branch August 22, 2023 17:22
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
3 participants