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

8264320: ShouldNotReachHere in Compile::print_inlining_move_to() #3635

Closed
wants to merge 1 commit into from

Conversation

@iwanowww
Copy link

@iwanowww iwanowww commented Apr 22, 2021

Cloned CallNode gets a fresh CallGenerator which has to be put on _print_inlining_list when -XX:+PrintInlining is used.

Otherwise, if the CallGenerator ends up on _late_inlines list (which is processed by Compile::process_late_inline_calls_no_inline(), Compile::print_inlining_move_to() can't locate it in _print_inlining_list and triggers the crash.

The fix is to put cloned CallGenerator next to original one in _print_inlining_list.

Testing:

  • failing test
  • hs-tier1 - hs-tier4

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8264320: ShouldNotReachHere in Compile::print_inlining_move_to()

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3635

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Apr 22, 2021

👋 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.

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Apr 22, 2021

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

Loading

@iwanowww iwanowww marked this pull request as ready for review Apr 22, 2021
@openjdk openjdk bot added the rfr label Apr 22, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Apr 22, 2021

Webrevs

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Apr 22, 2021

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

8264320: ShouldNotReachHere in Compile::print_inlining_move_to()

Reviewed-by: kvn, thartmann

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

  • 95f0fd6: 8265696: Move CDS sources to src/hotspot/shared/cds
  • a715b09: 8265798: Minimal build broken by JDK-8261090
  • 13d3263: 8265484: Fix up TRAPS usage in GenerateOopMap::compute_map and callers
  • a8ddbd1: 8265683: vmTestbase/nsk/jdb tests failed with "JDWP exit error AGENT_ERROR_INTERNAL(181)"
  • 7a55914: 8264196: Change link_and_cleanup_shared_classes(CATCH) to CHECK
  • b84f690: 8265793: Remove duplicate jtreg TEST.groups references for some client tests
  • 0e00598: 8265782: Bump bootjdk to jdk-17+19 on macosx-aarch64 at Oracle
  • e81baea: 8265786: ProblemList serviceability/sa/sadebugd/DisableRegistryTest.java on ZGC
  • ca0de26: 8265699: (bf) Scopes passed to ScopedMemoryAccess.copy[Swap]Memory in incorrect order
  • b930bb1: 8265461: G1: Forwarding pointer removal thread sizing
  • ... and 11 more: https://git.openjdk.java.net/jdk/compare/86bd44fe80c6222f81662b2167c402571ed68f43...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.

Loading

@openjdk openjdk bot added the ready label Apr 22, 2021
Copy link
Member

@TobiHartmann TobiHartmann left a comment

Looks good.

Loading

@iwanowww
Copy link
Author

@iwanowww iwanowww commented Apr 23, 2021

Thanks for the reviews, Vladimir and Tobias.

Loading

@iwanowww
Copy link
Author

@iwanowww iwanowww commented Apr 23, 2021

/integrate

Loading

@openjdk openjdk bot closed this Apr 23, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Apr 23, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Apr 23, 2021

@iwanowww Since your change was applied there have been 24 commits pushed to the master branch:

  • 5db64c3: 8265268: Unify ReservedSpace reservation code in initialize and try_reserve_heap
  • 191f1fc: 8265759: Shenandoah: Avoid race for referent in assert
  • b3a319c: 8264842: IGV: different nodes sharing idx are treated as equal
  • 95f0fd6: 8265696: Move CDS sources to src/hotspot/shared/cds
  • a715b09: 8265798: Minimal build broken by JDK-8261090
  • 13d3263: 8265484: Fix up TRAPS usage in GenerateOopMap::compute_map and callers
  • a8ddbd1: 8265683: vmTestbase/nsk/jdb tests failed with "JDWP exit error AGENT_ERROR_INTERNAL(181)"
  • 7a55914: 8264196: Change link_and_cleanup_shared_classes(CATCH) to CHECK
  • b84f690: 8265793: Remove duplicate jtreg TEST.groups references for some client tests
  • 0e00598: 8265782: Bump bootjdk to jdk-17+19 on macosx-aarch64 at Oracle
  • ... and 14 more: https://git.openjdk.java.net/jdk/compare/86bd44fe80c6222f81662b2167c402571ed68f43...master

Your commit was automatically rebased without conflicts.

Pushed as commit bfc1cd8.

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

Loading

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 participants