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

8307625: Redundant receiver null check in LibraryCallKit::generate_method_call #14542

Closed
wants to merge 3 commits into from

Conversation

enothum
Copy link
Contributor

@enothum enothum commented Jun 19, 2023

The null_check_receiver() calls in generate_method_call are redundant as all callers of generate_method_call already perform this check. For future uses of generate_method_call a new assert is introduced that fails if the caller does not null check the receiver.
Also generally null_check_receiver() should be combined with stopped(), which was not the case here.


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-8307625: Redundant receiver null check in LibraryCallKit::generate_method_call (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 14542

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 19, 2023

👋 Welcome back enothum! 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 Jun 19, 2023

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

  • hotspot-compiler

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-compiler hotspot-compiler-dev@openjdk.org label Jun 19, 2023
@enothum enothum marked this pull request as ready for review June 26, 2023 06:57
@openjdk openjdk bot added the rfr Pull request is ready for review label Jun 26, 2023
@mlbridge
Copy link

mlbridge bot commented Jun 26, 2023

Webrevs

Copy link
Member

@TobiHartmann TobiHartmann 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 to me.

@openjdk
Copy link

openjdk bot commented Jun 26, 2023

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

8307625: Redundant receiver null check in LibraryCallKit::generate_method_call

Reviewed-by: thartmann, chagedorn

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

  • 39c104d: 8310380: Handle problems in core-related tests on macOS when codesign tool does not work
  • 526dba1: 8310130: C2: assert(false) failed: scalar_input is neither phi nor a matchin reduction
  • 48e61c1: 8310728: Enable Zc:inline flag in Visual Studio build
  • 56a73a6: 8309591: Socket.setOption(TCP_QUICKACK) uses wrong level
  • afdaa2a: 8309109: AArch64: [TESTBUG] compiler/intrinsics/sha/cli/TestUseSHA3IntrinsicsOptionOnSupportedCPU.java fails on Neoverse N2 and V1
  • 7f09435: 8310982: jdk/internal/util/ArchTest.java fails after JDK-8308452 failed with Method isARM()
  • f07e396: 8310914: Remove 2 malformed java/foreign ProblemList entries
  • a97f98f: 8310585: GetThreadState spec mentions undefined JVMTI_THREAD_STATE_MONITOR_WAITING
  • 2cf5c2f: 8310238: [test bug] javax/swing/JTableHeader/6889007/bug6889007.java fails
  • 269852b: 8294316: SA core file support is broken on macosx-x64 starting with macOS 12.x
  • ... and 114 more: https://git.openjdk.org/jdk/compare/b896e3e02a28dde5d718cbc40f43a08f179269dd...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 (@TobiHartmann, @chhagedorn) 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 Jun 26, 2023
Copy link
Member

@chhagedorn chhagedorn left a comment

Choose a reason for hiding this comment

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

Thanks for adding the null check as discussed offline together with @TobiHartmann. Looks good!

@TobiHartmann
Copy link
Member

Just FTR: The intrinsified Unsafe::allocateUninitializedArray0 can currently not be called with a null receiver because it's private and only ever called from Unsafe::allocateUninitializedArray which would throw a NPE. But to be on the safe side in case this ever changes, we should emit a null check.

@enothum
Copy link
Contributor Author

enothum commented Jun 28, 2023

Thanks for the clarifications and reviews!

@enothum
Copy link
Contributor Author

enothum commented Jun 28, 2023

/integrate

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

openjdk bot commented Jun 28, 2023

@enothum
Your change (at version 47c05fd) is now ready to be sponsored by a Committer.

@TobiHartmann
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Jun 28, 2023

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

  • 39c104d: 8310380: Handle problems in core-related tests on macOS when codesign tool does not work
  • 526dba1: 8310130: C2: assert(false) failed: scalar_input is neither phi nor a matchin reduction
  • 48e61c1: 8310728: Enable Zc:inline flag in Visual Studio build
  • 56a73a6: 8309591: Socket.setOption(TCP_QUICKACK) uses wrong level
  • afdaa2a: 8309109: AArch64: [TESTBUG] compiler/intrinsics/sha/cli/TestUseSHA3IntrinsicsOptionOnSupportedCPU.java fails on Neoverse N2 and V1
  • 7f09435: 8310982: jdk/internal/util/ArchTest.java fails after JDK-8308452 failed with Method isARM()
  • f07e396: 8310914: Remove 2 malformed java/foreign ProblemList entries
  • a97f98f: 8310585: GetThreadState spec mentions undefined JVMTI_THREAD_STATE_MONITOR_WAITING
  • 2cf5c2f: 8310238: [test bug] javax/swing/JTableHeader/6889007/bug6889007.java fails
  • 269852b: 8294316: SA core file support is broken on macosx-x64 starting with macOS 12.x
  • ... and 114 more: https://git.openjdk.org/jdk/compare/b896e3e02a28dde5d718cbc40f43a08f179269dd...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jun 28, 2023
@openjdk openjdk bot closed this Jun 28, 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 Jun 28, 2023
@openjdk
Copy link

openjdk bot commented Jun 28, 2023

@TobiHartmann @enothum Pushed as commit c3f10e8.

💡 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-compiler hotspot-compiler-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants