8303466: C2: failed: malformed control flow. Limit type made precise with MaxL/MinL

[martinuy]

Hi,

I would like to propose a backport of 8303466 [1] to jdk11u. jdk11u can benefit from this fix and having more accurate limit type information.

The jdk17u patch does not apply cleanly because of the following:

• src/hotspot/share/opto/addnode.hpp

  • 11u does not have 8223347. Manually backported the MaxLNode/MinLNode class.

• src/hotspot/share/opto/macro.cpp

  • The 11u backport of 8275330 does not add n->Opcode() == Op_Opaque4 to the assertion. Manually applied the change.

• src/hotspot/share/opto/convertnode.cpp

  • 11u does not have 8256730 so the context is different. Manually applied the change.

• src/hotspot/share/opto/loopTransform.cpp

  • 11u does not have 8301074 (replace of NULL with nullptr) so the change does not apply cleanly. Manually applied the change.
  • 11u does not have 8273115, so the context is different.
  • The 11u backport of 8262017 has "set_subtree_ctrl(inner_result_long);" instead of "set_subtree_ctrl(inner_result_long, false);" so the context is different.

In addition, the following changes were made:

• C++11 lambda functions is_clamp and is_sub_con replaced with static equivalents.

• nullptr replaced with NULL

No regressions observed in hotspot:tier1.

Thanks,
Martin.-

--
[1] - https://bugs.openjdk.org/browse/JDK-8303466

---

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
• JDK-8303466 needs maintainer approval

Issue

• JDK-8303466: C2: failed: malformed control flow. Limit type made precise with MaxL/MinL (Bug - P3 - Approved)

Reviewers

• Roland Westrelin (@rwestrel - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk11u-dev.git pull/2814/head:pull/2814
$ git checkout pull/2814

Update a local copy of the PR:
$ git checkout pull/2814
$ git pull https://git.openjdk.org/jdk11u-dev.git pull/2814/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2814

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk11u-dev/pull/2814.diff

Webrev

Link to Webrev Comment

[bridgekeeper]

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

@martinuy This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8303466: C2: failed: malformed control flow. Limit type made precise with MaxL/MinL

Reviewed-by: roland

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

• 25d6e19: Merge
• 1e3e687: 8334441: Mark tests in jdk_security_infra group as manual
• e61adf6: 8261433: Better pkcs11 performance for libpkcs11:C_EncryptInit/libpkcs11:C_DecryptInit
• 59cd1a4: 8324755: Enable parallelism in vmTestbase/gc/gctests/LargeObjects tests
• 569c669: 8305079: Remove finalize() from compiler/c2/Test719030
• 724477c: 8305081: Remove finalize() from test/hotspot/jtreg/compiler/runtime/Test8168712

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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]

This backport pull request has now been updated with issue from the original commit.

[mlbridge]

Webrevs

• 00: Full (59e0a185)

[rwestrel]

Looks good to me.

[openjdk]

⚠️ @martinuy This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

[martinuy]

The GHA windows-aarch64 failure at build time seems unrelated to this backport. It's a failure in wget that we also observed in Fedora 40 for some URLs.

[martinuy]

/approval request jdk11u is affected by this bug and would benefit from its fix. The patch does not apply cleanly but has been reviewed.

[openjdk]

@martinuy
8303466: The approval request has been created successfully.

[martinuy]

/integrate

[openjdk]

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

• 6547a16: 8227122: [TESTBUG] Create Docker sidecar test cases
• 25d6e19: Merge
• 1e3e687: 8334441: Mark tests in jdk_security_infra group as manual
• e61adf6: 8261433: Better pkcs11 performance for libpkcs11:C_EncryptInit/libpkcs11:C_DecryptInit
• 59cd1a4: 8324755: Enable parallelism in vmTestbase/gc/gctests/LargeObjects tests
• 569c669: 8305079: Remove finalize() from compiler/c2/Test719030
• 724477c: 8305081: Remove finalize() from test/hotspot/jtreg/compiler/runtime/Test8168712

Your commit was automatically rebased without conflicts.

[openjdk]

@martinuy Pushed as commit 8578e12.

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