8290529: C2: assert(BoolTest(btest).is_canonical()) failure

[TobiHartmann]

Backport of JDK-8290529. Applies cleanly except for a change to surrounding code in IRNode.java. Approval is pending.

Thanks,
Tobias

---

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-8290529: C2: assert(BoolTest(btest).is_canonical()) failure

Reviewers

• Vladimir Kozlov (@vnkozlov - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 37

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk19u/pull/37.diff

[bridgekeeper]

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

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

[openjdk]

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

8290529: C2: assert(BoolTest(btest).is_canonical()) failure

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

• 3d1cabb: 8294517: Update jdk19u fix version to 19.0.2
• a1cc5be: 8288377: [REDO] DST not applying properly with zone id offset set with TZ env variable
• e102312: 8293834: Update CLDR data following tzdata 2022c update
• 7f34799: 8291508: Fix some tests with "requires vm.jvmti & vm.continuations"
• 59a331a: 8290496: riscv: Fix build warnings-as-errors with GCC 11
• 30294b3: 8286314: Trampoline not created for far runtime targets outside small CodeCache
• d0b021b: 8288992: AArch64: CMN should be handled the same way as CMP
• e6bd2c9: 8290246: test fails "assert(init != __null) failed: initialization not found"
• 27158f2: 8290451: Incorrect result when switching to C2 OSR compilation from C1
• 83cb884: 8290711: assert(false) failed: infinite loop in PhaseIterGVN::optimize
• ... and 9 more: https://git.openjdk.org/jdk19u/compare/903c21b0268f7c5e3bfd3ae69328b864fb3cc65c...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.

[mlbridge]

Webrevs

• 03: Full - Incremental (98edb49c)
• 02: Full - Incremental (19a9545a)
• 01: Full - Incremental (11377e92)
• 00: Full (a725c808)

[TobiHartmann]

Thanks, Vladimir!

[TobiHartmann]

Testing revealed that the definition of CMP_U is missing in IRNode.java. I added it.

[TobiHartmann]

I had to remove IR verification from the test because JDK-8283726 is not in JDK 19u.

[vnkozlov]

Still good.

[TobiHartmann]

Thanks, Vladimir!

[TobiHartmann]

/integrate

[openjdk]

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

• 3d1cabb: 8294517: Update jdk19u fix version to 19.0.2
• a1cc5be: 8288377: [REDO] DST not applying properly with zone id offset set with TZ env variable
• e102312: 8293834: Update CLDR data following tzdata 2022c update
• 7f34799: 8291508: Fix some tests with "requires vm.jvmti & vm.continuations"
• 59a331a: 8290496: riscv: Fix build warnings-as-errors with GCC 11
• 30294b3: 8286314: Trampoline not created for far runtime targets outside small CodeCache
• d0b021b: 8288992: AArch64: CMN should be handled the same way as CMP
• e6bd2c9: 8290246: test fails "assert(init != __null) failed: initialization not found"
• 27158f2: 8290451: Incorrect result when switching to C2 OSR compilation from C1
• 83cb884: 8290711: assert(false) failed: infinite loop in PhaseIterGVN::optimize
• ... and 9 more: https://git.openjdk.org/jdk19u/compare/903c21b0268f7c5e3bfd3ae69328b864fb3cc65c...master

Your commit was automatically rebased without conflicts.

[openjdk]

@TobiHartmann Pushed as commit 152d2f1.

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