Skip to content
This repository was archived by the owner on Sep 19, 2023. It is now read-only.
/ jdk19 Public archive

8288128: S390X: Fix crashes after JDK-8284161 (Virtual Threads) #110

Closed

Conversation

backwaterred
Copy link

@backwaterred backwaterred commented Jul 5, 2022

This PR adapts the changes to the PPC port from JDK-8286446 and JDK-8288105 to s390 in order to fix the crashes preventing a successful make images.

In addition, the following (minor) changes were made to the changesets above:

  • Change two instances of own_abi()->lr to own_abi()->return_pc (frame_s390.cpp:235,247)
  • Remove alignment assertion from frame::setup (frame_s390.inline.hpp:73)
  • Remove original_pc assertion from frame::patch_pc (frame_s390.cpp:251)
  • Add continuations_enabled guard to generate_phase1 (stubGenerator_s390.cpp:2937)

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-8288128: S390X: Fix crashes after JDK-8284161 (Virtual Threads)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 110

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk19/pull/110.diff

Sorry, something went wrong.

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 5, 2022

👋 Welcome back tsteele! 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 added the rfr Pull request is ready for review label Jul 5, 2022
@openjdk
Copy link

openjdk bot commented Jul 5, 2022

@backwaterred The following label will be automatically applied to this pull request:

  • hotspot

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the hotspot hotspot-dev@openjdk.org label Jul 5, 2022
@mlbridge
Copy link

mlbridge bot commented Jul 5, 2022

Webrevs

Copy link
Contributor

@TheRealMDoerr TheRealMDoerr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! Thanks for porting it to s390!

@openjdk
Copy link

openjdk bot commented Jul 5, 2022

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

8288128: S390X: Fix crashes after JDK-8284161 (Virtual Threads)

Reviewed-by: mdoerr

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

  • 30e134e: 8289091: move oop safety check from SharedRuntime::get_java_tid() to JavaThread::threadObj()
  • 29ea642: 8287847: Fatal Error when suspending virtual thread after it has terminated
  • f640fc5: 8067757: Incorrect HTML generation for copied javadoc with multiple @throws tags
  • 0dff327: 8289569: [test] java/lang/ProcessBuilder/Basic.java fails on Alpine/musl
  • 1a27164: 8287851: C2 crash: assert(t->meet(t0) == t) failed: Not monotonic
  • 5b5bc6c: 8287672: jtreg test com/sun/jndi/ldap/LdapPoolTimeoutTest.java fails intermittently in nightly run
  • dc4edd3: 8289183: jdk.jfr.consumer.RecordedThread.getId references Thread::getId, should be Thread::threadId
  • c4dcce4: 8289619: JVMTI SelfSuspendDisablerTest.java failed with RuntimeException: Test FAILED: Unexpected thread state
  • f5cdaba: 8245268: -Xcomp is missing from java launcher documentation
  • 9515560: 8288703: GetThreadState returns 0 for virtual thread that has terminated
  • ... and 7 more: https://git.openjdk.org/jdk19/compare/cf7154498fffba202b74b41a074f25c657b2e591...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 the ready Pull request is ready to be integrated label Jul 5, 2022
@backwaterred
Copy link
Author

Thanks Martin :-)

/integrate

@openjdk
Copy link

openjdk bot commented Jul 5, 2022

Going to push as commit 0b6fd48.
Since your change was applied there have been 17 commits pushed to the master branch:

  • 30e134e: 8289091: move oop safety check from SharedRuntime::get_java_tid() to JavaThread::threadObj()
  • 29ea642: 8287847: Fatal Error when suspending virtual thread after it has terminated
  • f640fc5: 8067757: Incorrect HTML generation for copied javadoc with multiple @throws tags
  • 0dff327: 8289569: [test] java/lang/ProcessBuilder/Basic.java fails on Alpine/musl
  • 1a27164: 8287851: C2 crash: assert(t->meet(t0) == t) failed: Not monotonic
  • 5b5bc6c: 8287672: jtreg test com/sun/jndi/ldap/LdapPoolTimeoutTest.java fails intermittently in nightly run
  • dc4edd3: 8289183: jdk.jfr.consumer.RecordedThread.getId references Thread::getId, should be Thread::threadId
  • c4dcce4: 8289619: JVMTI SelfSuspendDisablerTest.java failed with RuntimeException: Test FAILED: Unexpected thread state
  • f5cdaba: 8245268: -Xcomp is missing from java launcher documentation
  • 9515560: 8288703: GetThreadState returns 0 for virtual thread that has terminated
  • ... and 7 more: https://git.openjdk.org/jdk19/compare/cf7154498fffba202b74b41a074f25c657b2e591...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jul 5, 2022

@backwaterred Pushed as commit 0b6fd48.

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

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
hotspot hotspot-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

None yet

2 participants