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

8277447: Hotspot C1 compiler crashes on Kotlin suspend fun with loop #770

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Jan 17, 2022

I backport this for parity with 11.0.15-oracle.

I had to do adaptions in the test:

  • I changed the class file version from 62 to 55 in the .jasm file.
  • I replaced -XX:CompilationMode=quick-only by -XX:TieredStopAtLevel=3
    because the flag CompilationMode is not in 11. I tried to reproduce the bug
    with the new settings, but I can not see the bug. But I also can not reproduce
    it with the original test and the original 17 release. The test is passing with and
    without the fix.

Progress

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

Issue

  • JDK-8277447: Hotspot C1 compiler crashes on Kotlin suspend fun with loop

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/770/head:pull/770
$ git checkout pull/770

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 770

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/770.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jan 17, 2022

👋 Welcome back goetz! 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 b46f0b0b1f2ada705f8b5aac9b7d8423699437a1 8277447: Hotspot C1 compiler crashes on Kotlin suspend fun with loop Jan 17, 2022
@openjdk
Copy link

@openjdk openjdk bot commented Jan 17, 2022

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

@openjdk openjdk bot added backport rfr labels Jan 17, 2022
@mlbridge
Copy link

@mlbridge mlbridge bot commented Jan 17, 2022

Webrevs

Copy link
Member

@phohensee phohensee left a comment

There is no .jasm file in the patch.

@GoeLin GoeLin force-pushed the goetz_backport_8277447 branch from 0c3adc8 to 6fdf044 Compare Jan 19, 2022
@openjdk openjdk bot added the clean label Jan 19, 2022
@openjdk
Copy link

@openjdk openjdk bot commented Jan 19, 2022

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

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

8277447: Hotspot C1 compiler crashes on Kotlin suspend fun with loop

Reviewed-by: phh

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 44 new commits pushed to 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 openjdk bot added the ready label Jan 19, 2022
@GoeLin
Copy link
Member Author

@GoeLin GoeLin commented Jan 19, 2022

@phohensee, thanks for spotting this! Fixed. I will run it through our nightly tests again to make sure the test passes on all platforms we build.

@GoeLin GoeLin force-pushed the goetz_backport_8277447 branch from 6fdf044 to 614798f Compare Jan 19, 2022
@GoeLin
Copy link
Member Author

@GoeLin GoeLin commented Jan 19, 2022

I had to update it again... this time my adaptions were missing :(

@openjdk openjdk bot removed clean ready labels Jan 19, 2022
Copy link
Member

@phohensee phohensee left a comment

Revision lgtm.

@openjdk openjdk bot added the ready label Jan 19, 2022
@GoeLin
Copy link
Member Author

@GoeLin GoeLin commented Jan 22, 2022

@phohensee, thanks for reviewing!

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Jan 22, 2022

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

  • efe46bb: 8275610: C2: Object field load floats above its null check resulting in a segfault
  • 716ceb7: 8266421: Deadlock in Sound System
  • b5cae57: 8274795: AArch64: avoid spilling and restoring r18 in macro assembler
  • 914d48c: 8232533: G1 uses only a single thread for pretouching the java heap
  • ec03928: 8273933: [TESTBUG] Test must run without preallocated exceptions
  • cba6c04: 8268542: serviceability/logging/TestFullNames.java tests only 1st test case
  • 521144c: 8251998: remove usage of PropertyResolvingWrapper in vmTestbase/jit/t
  • f69e75f: 8273438: Enable parallelism in vmTestbase/metaspace/stressHierarchy tests
  • 574c04c: 8273433: Enable parallelism in vmTestbase_nsk_sysdict tests
  • 5ffd40d: 8273341: Update Siphash to version 1.0
  • ... and 44 more: https://git.openjdk.java.net/jdk11u-dev/compare/89f4d44106cf40aa4ca5a9e09e9c4aa511afa035...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated label Jan 22, 2022
@openjdk openjdk bot closed this Jan 22, 2022
@openjdk openjdk bot removed ready rfr labels Jan 22, 2022
@openjdk
Copy link

@openjdk openjdk bot commented Jan 22, 2022

@GoeLin Pushed as commit 809b015.

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

@GoeLin GoeLin deleted the goetz_backport_8277447 branch Jan 22, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated
2 participants