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

8287223: C1: Inlining attempt through MH::invokeBasic() with null receiver #8894

Closed
wants to merge 4 commits into from

Conversation

iwanowww
Copy link

@iwanowww iwanowww commented May 25, 2022

Inlining attempt through MH::invokeBasic() when receiver is null. It triggers an assert when attempting to extract a Method* from a null constant.

Proposed fix bails out inlining attempt when receiver is null constant.

C2 has a similar issue, but the particular bytecode shape of MH::invokeExact() invoker hides the bug (dominating MH::type() call involves a null check and problematic call isn't compiled at all).

Testing: hs-tier1 - hs-tier4


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-8287223: C1: Inlining attempt through MH::invokeBasic() with null receiver

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/8894/head:pull/8894
$ git checkout pull/8894

Update a local copy of the PR:
$ git checkout pull/8894
$ git pull https://git.openjdk.java.net/jdk pull/8894/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 8894

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/8894.diff

@bridgekeeper
Copy link

bridgekeeper bot commented May 25, 2022

👋 Welcome back vlivanov! 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 May 25, 2022

@iwanowww 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 May 25, 2022
@iwanowww iwanowww marked this pull request as ready for review May 25, 2022 22:27
@openjdk openjdk bot added the rfr Pull request is ready for review label May 25, 2022
@mlbridge
Copy link

mlbridge bot commented May 25, 2022

Webrevs

const TypeOopPtr* oop_ptr = receiver->bottom_type()->is_oopptr();
ciMethod* target = oop_ptr->const_oop()->as_method_handle()->get_vmtarget();
const int vtable_index = Method::invalid_vtable_index;
ciObject* recv_obj = receiver->bottom_type()->is_oopptr()->const_oop();
Copy link
Contributor

Choose a reason for hiding this comment

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

In general ConP could be NULL_PTR (AnyPtr). I think you need to use isa_oopptr() and check for NULL here.
Or it can't be NULL_PTR in this case?

Copy link
Author

Choose a reason for hiding this comment

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

Good catch, Vladimir. I fixed the code and enhanced the test to exercise problematic case by C2.

Copy link
Contributor

@vnkozlov vnkozlov left a comment

Choose a reason for hiding this comment

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

Good.

@openjdk
Copy link

openjdk bot commented May 27, 2022

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

8287223: C1: Inlining attempt through MH::invokeBasic() with null receiver

Reviewed-by: kvn

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

  • 6520843: 8287003: InputStreamReader::read() can return zero despite writing a char in the buffer
  • 63eb0b7: 8282947: JFR: Dump on shutdown live-locks in some conditions
  • f2bc447: 8271406: Kitchensink failed with "assert(early->flag() == current->flag()) failed: Should be the same"
  • be93318: 8287292: Improve TransformKey to pack more kinds of transforms efficiently
  • 777f813: 8268422: Find a better way to select releases in "New API" page
  • 22e2067: 8282182: Document algorithm used to encode aarch64 logical immediate operands.
  • 37ecbb4: 8277420: Provide a way to copy the hyperlink to a doc element to the clipboard
  • 176bb23: 8287200: Test java/lang/management/ThreadMXBean/VirtualThreadDeadlocks.java timed out after JDK-8287103
  • ec97da9: 8287352: DockerTestUtils::execute shows incorrect elapsed time
  • 140419f: 8286058: AArch64: clarify types of calls
  • ... and 37 more: https://git.openjdk.java.net/jdk/compare/194bc08a899d699b34d3d896001af8c642758b1d...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 May 27, 2022
@iwanowww
Copy link
Author

Thanks for the review, Vladimir.

/integrate

@openjdk
Copy link

openjdk bot commented May 27, 2022

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

  • 0df4748: 8287463: JFR: Disable TestDevNull.java on Windows
  • 6520843: 8287003: InputStreamReader::read() can return zero despite writing a char in the buffer
  • 63eb0b7: 8282947: JFR: Dump on shutdown live-locks in some conditions
  • f2bc447: 8271406: Kitchensink failed with "assert(early->flag() == current->flag()) failed: Should be the same"
  • be93318: 8287292: Improve TransformKey to pack more kinds of transforms efficiently
  • 777f813: 8268422: Find a better way to select releases in "New API" page
  • 22e2067: 8282182: Document algorithm used to encode aarch64 logical immediate operands.
  • 37ecbb4: 8277420: Provide a way to copy the hyperlink to a doc element to the clipboard
  • 176bb23: 8287200: Test java/lang/management/ThreadMXBean/VirtualThreadDeadlocks.java timed out after JDK-8287103
  • ec97da9: 8287352: DockerTestUtils::execute shows incorrect elapsed time
  • ... and 38 more: https://git.openjdk.java.net/jdk/compare/194bc08a899d699b34d3d896001af8c642758b1d...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented May 27, 2022

@iwanowww Pushed as commit d3e781d.

💡 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
2 participants