Skip to content

8337783: Use THROW_NULL instead of THROW_0 in pointer contexts in misc runtime code #20457

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

kimbarrett
Copy link

@kimbarrett kimbarrett commented Aug 3, 2024

Please review this trivial change that, in misc. runtime code where a pointer
value is required, replaces uses of THROW_0 and THROW_MSG_0 with THROW_NULL
and THROW_MSG_NULL respectively.

Testing: mach5 tier1


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-8337783: Use THROW_NULL instead of THROW_0 in pointer contexts in misc runtime code (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 20457

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 3, 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
Copy link

openjdk bot commented Aug 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:

8337783: Use THROW_NULL instead of THROW_0 in pointer contexts in misc runtime code

Reviewed-by: stefank, shade

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

  • c095c0e: 8336489: Track scoped accesses in JVMCI compiled code
  • 7e925d7: 8337283: configure.log is truncated when build dir is on different filesystem
  • 2e093b0: 8337779: test/jdk/jdk/jfr/jvm/TestHiddenWait.java is a bit fragile
  • d3e7b0c: 8336462: ConcurrentSkipListSet Javadoc incorrectly warns about size method complexity
  • be34730: 8335257: Refactor code to create Initialized Assertion Predicates into separate class
  • fbe8a81: 8333144: docker tests do not work when ubsan is configured
  • dabdae6: 8334599: Improve code from JDK-8302671
  • 8bd3cd5: 8337716: ByteBuffer hashCode implementations are inconsistent

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 rfr Pull request is ready for review label Aug 3, 2024
@openjdk
Copy link

openjdk bot commented Aug 3, 2024

@kimbarrett 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 Aug 3, 2024
@mlbridge
Copy link

mlbridge bot commented Aug 3, 2024

Webrevs

Copy link
Member

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

I saw at least one instance of THROW_ARG_0, which returns 0. Do you intend to fix that as a separate change?

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Aug 5, 2024
Copy link
Member

@shipilev shipilev left a comment

Choose a reason for hiding this comment

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

Current changes look okay. Same as in other PR, I have not checked these caught all the instances of THROW_* in those files.

@kimbarrett
Copy link
Author

Looks good.

I saw at least one instance of THROW_ARG_0, which returns 0. Do you intend to fix that as a separate change?

Yes. There are a few of those scattered about. We don't currently have THROW_ARG_NULL to use in these places.
I chose to keep this change simple.

@kimbarrett
Copy link
Author

Thanks for reviews @shipilev and @stefank

@kimbarrett
Copy link
Author

/integrate

@openjdk
Copy link

openjdk bot commented Aug 5, 2024

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

  • 431d4f7: 8337785: Fix simple -Wzero-as-null-pointer-constant warnings in x86 code
  • e2c07d5: 8337299: vmTestbase/nsk/jdb/stop_at/stop_at002/stop_at002.java failure goes undetected
  • 08f697f: 8337819: Update GHA JDKs to 22.0.2
  • 42652b2: 8337787: Fix -Wzero-as-null-pointer-constant warnings when JVMTI feature is disabled
  • 807186f: 8337784: Fix simple -Wzero-as-null-pointer-constant warnings in linux/posix code
  • e68df52: 8337054: JDK 23 RDP2 L10n resource files update
  • 9856216: 8336928: GHA: Bundle artifacts removal broken
  • 219e1eb: 8337712: Wrong javadoc in java.util.Date#toString(): "61" and right parenthesis
  • 97afbd9: 8336410: runtime/NMT/TotalMallocMmapDiffTest.java Total malloc diff is incorrect. Expected malloc diff range
  • c095c0e: 8336489: Track scoped accesses in JVMCI compiled code
  • ... and 7 more: https://git.openjdk.org/jdk/compare/367e0a65561f95aad61b40930d5f46843fee3444...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 5, 2024

@kimbarrett Pushed as commit 7146dae.

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

@kimbarrett kimbarrett deleted the runtime-throw branch August 5, 2024 20:05
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
Development

Successfully merging this pull request may close these issues.

3 participants