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

8313626: C2 crash due to unexpected exception control flow #2107

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Aug 30, 2023

Clean backport to fix C2 failure.

Additional testing:

  • New test passes both with the patch, and WITHOUT THE PATCH
  • Linux AArch64 tier1 tier2 tier3

Progress

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

Issue

  • JDK-8313626: C2 crash due to unexpected exception control flow (Bug - P3)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2107

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 30, 2023

👋 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 f8203cb272e6136b784e5c43a500f6a0bfb19c8b 8313626: C2 crash due to unexpected exception control flow Aug 30, 2023
@openjdk
Copy link

openjdk bot commented Aug 30, 2023

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

@openjdk
Copy link

openjdk bot commented Aug 30, 2023

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

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

8313626: C2 crash due to unexpected exception control flow

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

  • 5327f67: 8313707: GHA: Bootstrap sysroots with --variant=minbase
  • 72018a1: 8313576: GCC 7 reports compiler warning in bundled freetype 2.13.0
  • dc47d1f: 8292407: Improve Weak CAS VarHandle/Unsafe tests resilience under spurious failures
  • 1bbbad1: 8315480: [11u] Harmonize GHA cross-compilation block with mainline
  • 7ce9271: 8314262: GHA: Cut down cross-compilation sysroots deeper
  • caa05ac: 8294281: Allow warnings to be disabled on a per-file basis
  • 4cd3ad9: 8299330: Minor improvements in MSYS2 Workflow handling
  • 373be43: 8294956: GHA: qemu-debootstrap is deprecated, use the regular one
  • f5eb11f: 8294941: GHA: Cut down cross-compilation sysroots
  • 121c997: 8312535: MidiSystem.getSoundbank() throws unexpected SecurityException
  • ... and 2 more: https://git.openjdk.org/jdk11u-dev/compare/b984b0a2937ad612697586d4f90e18dbc22d2571...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 rfr Pull request is ready for review labels Aug 30, 2023
@mlbridge
Copy link

mlbridge bot commented Aug 30, 2023

Webrevs

@shipilev
Copy link
Member Author

shipilev commented Sep 5, 2023

Testing is clean. Push approval granted.

/integrate

@openjdk
Copy link

openjdk bot commented Sep 5, 2023

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

  • 3eb7a82: 8314730: GHA: Drop libfreetype6-dev transitional package in favor of libfreetype-dev
  • 5327f67: 8313707: GHA: Bootstrap sysroots with --variant=minbase
  • 72018a1: 8313576: GCC 7 reports compiler warning in bundled freetype 2.13.0
  • dc47d1f: 8292407: Improve Weak CAS VarHandle/Unsafe tests resilience under spurious failures
  • 1bbbad1: 8315480: [11u] Harmonize GHA cross-compilation block with mainline
  • 7ce9271: 8314262: GHA: Cut down cross-compilation sysroots deeper
  • caa05ac: 8294281: Allow warnings to be disabled on a per-file basis
  • 4cd3ad9: 8299330: Minor improvements in MSYS2 Workflow handling
  • 373be43: 8294956: GHA: qemu-debootstrap is deprecated, use the regular one
  • f5eb11f: 8294941: GHA: Cut down cross-compilation sysroots
  • ... and 3 more: https://git.openjdk.org/jdk11u-dev/compare/b984b0a2937ad612697586d4f90e18dbc22d2571...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Sep 5, 2023

@shipilev Pushed as commit 765f6af.

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

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