Skip to content

8337782: Use THROW_NULL instead of THROW_0 in pointer contexts in prims code#20456

Closed
kimbarrett wants to merge 1 commit intoopenjdk:masterfrom
kimbarrett:prims-throw
Closed

8337782: Use THROW_NULL instead of THROW_0 in pointer contexts in prims code#20456
kimbarrett wants to merge 1 commit intoopenjdk:masterfrom
kimbarrett:prims-throw

Conversation

@kimbarrett
Copy link

@kimbarrett kimbarrett commented Aug 3, 2024

Please review this trivial change that, in places in prims 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-8337782: Use THROW_NULL instead of THROW_0 in pointer contexts in prims code (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 20456

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/20456.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:

8337782: Use THROW_NULL instead of THROW_0 in pointer contexts in prims code

Reviewed-by: shade, dholmes

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

  • 73718fb: 8337788: RISC-V: Cleanup code in MacroAssembler::reserved_stack_check
  • 965d6b9: 8335836: serviceability/jvmti/StartPhase/AllowedFunctions/AllowedFunctions.java fails with unexpected exit code: 112
  • 7146dae: 8337783: Use THROW_NULL instead of THROW_0 in pointer contexts in misc runtime code
  • 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
  • ... and 10 more: https://git.openjdk.org/jdk/compare/367e0a65561f95aad61b40930d5f46843fee3444...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 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

@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. I have not checked these caught all the instances of THROW_MSG_0 in those files, did you check that somehow?

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

Current changes look okay. I have not checked these caught all the instances of THROW_MSG_0 in those files, did you check that somehow?

I'm developing these changes on a branch that has -Wzero-as-null-pointer-constant enabled, then cherry picking
related groups of changes into a separate branch for a PR. I look at the build logs from the first to find a given set of
warnings. So there may be more warnings coming from some of those files, but not from that specific usage. Although
this means I might touch some files more than once, it has seemed to me better to keep most PRs simple and easy to
review.

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

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

Okay. Thanks for cleaning up.

@kimbarrett
Copy link
Author

Thanks for reviews @shipilev and @dholmes-ora

@kimbarrett
Copy link
Author

/integrate

@openjdk
Copy link

openjdk bot commented Aug 6, 2024

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

  • 73718fb: 8337788: RISC-V: Cleanup code in MacroAssembler::reserved_stack_check
  • 965d6b9: 8335836: serviceability/jvmti/StartPhase/AllowedFunctions/AllowedFunctions.java fails with unexpected exit code: 112
  • 7146dae: 8337783: Use THROW_NULL instead of THROW_0 in pointer contexts in misc runtime code
  • 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
  • ... and 10 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 6, 2024
@openjdk openjdk bot closed this Aug 6, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Aug 6, 2024
@openjdk
Copy link

openjdk bot commented Aug 6, 2024

@kimbarrett Pushed as commit 2057594.

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

@kimbarrett kimbarrett deleted the prims-throw branch August 6, 2024 05:34
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