8352963: [REDO] Missing late inline cleanup causes compiler/vectorapi/VectorLogicalOpIdentityTest.java IR failure

[dafedafe]

This PR is a REDO of JDK-8302459 (PR, backout triggered by a failing internal test).

There was an issue with CallGenerator::for_method_handle_call that could delay late inlining by creating a "generic" LateInlineCallGenerator instead of a more specific LateInlineMHCallGenerator:

jdk/src/hotspot/share/opto/callGenerator.cpp

Line 991 in 74df384

return CallGenerator::for_late_inline(callee, cg);

While running IGVN this could be misinterpreted as non-MH late-inline

jdk/src/hotspot/share/opto/callnode.cpp

Lines 1088 to 1091 in c282fb9

	Node* CallStaticJavaNode::Ideal(PhaseGVN* phase, bool can_reshape) {
	CallGenerator* cg = generator();
	if (can_reshape && cg != nullptr) {
	if (cg->is_mh_late_inline()) {

eventually triggering assert(!cg->method()->is_method_handle_intrinsic(), "required");

The fix involves creating a LateInlineMHCallGenerator instead. Here is what changed from the backed out PR:

jdk/src/hotspot/share/opto/callGenerator.cpp

Lines 991 to 995 in c282fb9

	if (IncrementalInlineMH) {
	CallGenerator::for_mh_late_inline(caller, callee, input_not_const);
	} else {
	CallGenerator::for_late_inline(callee, cg);
	}

Testing

Tier 1-4 (windows-x64, linux-x64/aarch64, and macosx-x64/aarch64; release and debug mode)

---

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-8352963: [REDO] Missing late inline cleanup causes compiler/vectorapi/VectorLogicalOpIdentityTest.java IR failure (Bug - P4)

Reviewers

• Vladimir Ivanov (@iwanowww - Reviewer)
• Tobias Hartmann (@TobiHartmann - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 24402

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

Using diff file

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

Using Webrev

Link to Webrev Comment

[bridgekeeper]

👋 Welcome back dfenacci! 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]

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

8352963: [REDO] Missing late inline cleanup causes compiler/vectorapi/VectorLogicalOpIdentityTest.java IR failure

Reviewed-by: vlivanov, 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 289 new commits pushed to the master branch:

• 9844c1c: 8066583: DeflaterInput/OutputStream and InflaterInput/OutputStream should explain responsibility for freeing resources
• fb955bc: 8353267: jmod create finds the wrong set of packages when class file are in non-package location
• 80ff7b9: 8353695: RISC-V: compiler/cpuflags/TestAESIntrinsicsOnUnsupportedConfig.java is failing with Zvkn
• ... and 286 more: https://git.openjdk.org/jdk/compare/74df384a9870431efb184158bba032c79c35356e...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]

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

[mlbridge]

Webrevs

• 01: Full - Incremental (3fa592b7)
• 00: Full (c282fb9a)

[iwanowww]

Would -XX:-IncrementalInlineMH hit the very same assertion? Should we simply require IncrementalInlineMH to delay inlining instead?

[dafedafe]

Would -XX:-IncrementalInlineMH hit the very same assertion?

Indeed! 🤦‍♂️

Should we simply require IncrementalInlineMH to delay inlining instead?

Yes. I removed the non-MH late inline call as well.

Thanks @iwanowww!

[iwanowww]

Looks good.

[TobiHartmann]

Looks good to me!

[dafedafe]

Thank you for your reviews @iwanowww and @TobiHartmann.

[dafedafe]

/integrate

[openjdk]

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

• dfa79c3: 8340321: Disable SHA-1 in TLS/DTLS 1.2 handshake signatures
• cc5e938: 8353600: RISC-V: compiler/vectorization/TestRotateByteAndShortVector.java is failing with Zvbb
• 21db0fd: 8353665: RISC-V: IR verification fails in TestSubNodeFloatDoubleNegation.java
• ... and 295 more: https://git.openjdk.org/jdk/compare/74df384a9870431efb184158bba032c79c35356e...master

Your commit was automatically rebased without conflicts.

[openjdk]

@dafedafe Pushed as commit d9f2e69.

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