Skip to content

8311646: ZGC: LIR_OpZStoreBarrier::_info shadows LIR_Op::_info #14816

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

Closed
wants to merge 1 commit into from

Conversation

chadrako
Copy link
Contributor

@chadrako chadrako commented Jul 10, 2023

JDK-8311646

In LIR_OpZStoreBarrier, SonarCloud reports:
Field "_info" shadows a field of the same name in base class "LIR_Op".

Updates LIR_OpZStoreBarrier to use the superclass _info instead

Additional testing:

  • Linux x86_64 fastdebug tier2
  • Linux x86_64 release tier2
  • Linux x86_64 fastdebug test/hotspot/jtreg/gc/z
  • Linux x86_64 release test/hotspot/jtreg/gc/z
  • Linux x86_64 fastdebug gtest:all
  • Linux x86_64 release gtest:all

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-8311646: ZGC: LIR_OpZStoreBarrier::_info shadows LIR_Op::_info (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 14816

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 10, 2023

👋 Welcome back chadrako! 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 Jul 10, 2023
@openjdk
Copy link

openjdk bot commented Jul 10, 2023

@chadrako 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 Jul 10, 2023
@mlbridge
Copy link

mlbridge bot commented Jul 10, 2023

Webrevs

@chadrako chadrako marked this pull request as draft July 10, 2023 21:05
@openjdk openjdk bot removed the rfr Pull request is ready for review label Jul 10, 2023
@chadrako chadrako marked this pull request as ready for review July 11, 2023 16:22
@openjdk openjdk bot added the rfr Pull request is ready for review label Jul 11, 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.

I agree the old code looks suspect, and this change looks good to me. However,
it would be good to get an opinion from one of the genzgc folks, because the
/* info */ comment makes it look like the weirdness is intentional. Though
maybe it was just cribbed from the similar load that was fixed by JDK-8278141.

@openjdk
Copy link

openjdk bot commented Jul 21, 2023

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

8311646: ZGC: LIR_OpZStoreBarrier::_info shadows LIR_Op::_info

Reviewed-by: kbarrett, eosterlund, ksakata

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

  • d63bff6: 8312578: Redundant javadoc in X400Address
  • d0761c1: 8312077: Fix signed integer overflow, final part
  • 2bdfa83: 8262742: (fs) Add Path::resolve with varargs string
  • 8008e27: 8308903: Print detailed info for Java objects in -Xlog:cds+map
  • d8f2e9a: 8310530: PipedOutputStream.flush() accesses sink racily
  • fac9f88: 8311631: When multiple users run tools/jpackage/share/LicenseTest.java, Permission denied for writing /var/tmp/*.files
  • d5c6b0d: 8311261: [AIX] TestAlwaysPreTouchStacks.java fails due to java.lang.RuntimeException: Did not find expected NMT output
  • d1cc278: 8311822: AIX : test/jdk/java/foreign/TestLayouts.java fails because of different output - expected [i4] but found [I4]
  • 3caf64e: 8309238: jdk/jfr/tool/TestView.java failed with "exitValue = 134"
  • 298dda4: 8301457: Code in SendPortZero.java is uncommented even after JDK-8236852 was fixed
  • ... and 151 more: https://git.openjdk.org/jdk/compare/b285ed72aebe2d802fa9c071372cea6c09870b9a...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@kimbarrett, @fisk, @jyukutyo) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jul 21, 2023
Copy link
Contributor

@fisk fisk 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.

@chadrako
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Jul 24, 2023
@openjdk
Copy link

openjdk bot commented Jul 24, 2023

@chadrako
Your change (at version f100db3) is now ready to be sponsored by a Committer.

@jyukutyo
Copy link
Member

I'll sponsor you.

@jyukutyo
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Jul 25, 2023

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

  • d63bff6: 8312578: Redundant javadoc in X400Address
  • d0761c1: 8312077: Fix signed integer overflow, final part
  • 2bdfa83: 8262742: (fs) Add Path::resolve with varargs string
  • 8008e27: 8308903: Print detailed info for Java objects in -Xlog:cds+map
  • d8f2e9a: 8310530: PipedOutputStream.flush() accesses sink racily
  • fac9f88: 8311631: When multiple users run tools/jpackage/share/LicenseTest.java, Permission denied for writing /var/tmp/*.files
  • d5c6b0d: 8311261: [AIX] TestAlwaysPreTouchStacks.java fails due to java.lang.RuntimeException: Did not find expected NMT output
  • d1cc278: 8311822: AIX : test/jdk/java/foreign/TestLayouts.java fails because of different output - expected [i4] but found [I4]
  • 3caf64e: 8309238: jdk/jfr/tool/TestView.java failed with "exitValue = 134"
  • 298dda4: 8301457: Code in SendPortZero.java is uncommented even after JDK-8236852 was fixed
  • ... and 151 more: https://git.openjdk.org/jdk/compare/b285ed72aebe2d802fa9c071372cea6c09870b9a...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jul 25, 2023

@jyukutyo @chadrako Pushed as commit 9999838.

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

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
Development

Successfully merging this pull request may close these issues.

4 participants