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

8323154: C2: assert(cmp != nullptr && cmp->Opcode() == Op_Cmp(bt)) failed: no exit test #201

Closed

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Jan 22, 2024

Clean backport to fix another C2 corner case; introduced by https://bugs.openjdk.org/browse/JDK-8316719, which is in 21.0.2.

Additional testing:

  • New test fails without the fix, passes with it
  • Linux x86_64 fastdebug tier{1,2,3,4}

Progress

  • JDK-8323154 needs maintainer approval
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8323154: C2: assert(cmp != nullptr && cmp->Opcode() == Op_Cmp(bt)) failed: no exit test (Bug - P3 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 201

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

Using diff file

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

Webrev

Link to Webrev Comment

@shipilev shipilev marked this pull request as ready for review January 22, 2024 08:53
@bridgekeeper
Copy link

bridgekeeper bot commented Jan 22, 2024

👋 Welcome back shade! 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 openjdk bot changed the title Backport 6997bfc68def7f80fbf6a7486a4b9f61225fc471 8323154: C2: assert(cmp != nullptr && cmp->Opcode() == Op_Cmp(bt)) failed: no exit test Jan 22, 2024
@openjdk
Copy link

openjdk bot commented Jan 22, 2024

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

@openjdk
Copy link

openjdk bot commented Jan 22, 2024

⚠️ @shipilev 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.

@openjdk openjdk bot added the rfr Pull request is ready for review label Jan 22, 2024
@mlbridge
Copy link

mlbridge bot commented Jan 22, 2024

Webrevs

@shipilev
Copy link
Member Author

/approval request Clean backport to fix another C2 corner case; introduced by JDK-8316719, which is in 21.0.2. Applies cleanly. Tests pass.

@openjdk
Copy link

openjdk bot commented Jan 22, 2024

@shipilev
8323154: The approval request has been created successfully.

@openjdk openjdk bot added the approval label Jan 22, 2024
@openjdk
Copy link

openjdk bot commented Jan 23, 2024

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

8323154: C2: assert(cmp != nullptr && cmp->Opcode() == Op_Cmp(bt)) failed: no exit test

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

  • ada400c: 8318158: RISC-V: implement roundD/roundF intrinsics
  • 1dd2f2a: 8169475: WheelModifier.java fails by timeout
  • e9be531: 8077371: Binary files in JAXP test should be removed
  • 69416f4: 8318809: java/util/concurrent/ConcurrentLinkedQueue/WhiteBox.java shows intermittent failures on linux ppc64le and aarch64
  • c01bdbb: 8314283: Support for NSS tests on aarch64 platforms
  • c3657ee: 8317771: [macos14] Expand/collapse a JTree using keyboard freezes the application in macOS 14 Sonoma
  • 95e36bc: 8322279: Generational ZGC: Use ZFragmentationLimit and ZYoungCompactionLimit as percentage instead of multiples
  • 6443937: 8323008: filter out harmful -std* flags added by autoconf from CXX
  • c8f0418: 8310031: Parallel: Implement better work distribution for large object arrays in old gen
  • 0d30c8d: 8318590: JButton ignores margin when painting HTML text
  • ... and 17 more: https://git.openjdk.org/jdk21u-dev/compare/95142cf93bb6ac1abe085af51dac91b8e2bd739e...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 ready Pull request is ready to be integrated and removed approval labels Jan 23, 2024
@shipilev
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Jan 30, 2024

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

  • 9bc6bd6: 8320943: Files/probeContentType/Basic.java fails on latest Windows 11 - content type mismatch
  • 5df2a5c: 8313507: Remove pkcs11/Cipher/TestKATForGCM.java from ProblemList
  • 45b428f: 8315600: Open source few more headless Swing misc tests
  • dead333: 8274122: java/io/File/createTempFile/SpecialTempFile.java fails in Windows 11
  • 14f62ac: 8324280: RISC-V: Incorrect implementation in VM_Version::parse_satp_mode
  • 7f40804: 8324659: GHA: Generic jtreg errors are not reported
  • ca85d55: 8315761: Open source few swing JList and JMenuBar tests
  • a9498e5: 8322142: JFR: Periodic tasks aren't orphaned between recordings
  • bf7c218: 8321480: ISO 4217 Amendment 176 Update
  • e2cabfe: 8316947: Write a test to check textArea triggers MouseEntered/MouseExited events properly
  • ... and 42 more: https://git.openjdk.org/jdk21u-dev/compare/95142cf93bb6ac1abe085af51dac91b8e2bd739e...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 30, 2024

@shipilev Pushed as commit 2518d20.

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

@shipilev shipilev deleted the JDK-8323154-c2-long-counted-loops branch February 7, 2024 15:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated Pull request has been integrated
1 participant