8373837: "assert(thread->is_VM_thread() || thread->is_Java_thread()) failed: Must be VMThread or JavaThread" on macosx-aarch64-26

[dholmes-ora]

If the SR signal is delivered late, there is a small window where the JavaThread destructor has run (and so the referenced assert will fail), but the Thread destructor has not yet reached the point where is_terminated returns true, and so we proceed to the assertion, that then fails. The simple fix is to move the assertion into the branch for an active suspension request, which guarantees we can't be executing destructors yet. See JBS for gory details.

EDIT: s/can/can't/

Testing: tiers 1-3 (sanity)

Thanks

---

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-8373837: "assert(thread->is_VM_thread() || thread->is_Java_thread()) failed: Must be VMThread or JavaThread" on macosx-aarch64-26 (Bug - P3)

Reviewers

• Fredrik Bredberg (@fbredber - Reviewer)
• Coleen Phillimore (@coleenp - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 28883

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/28883.diff

Using Webrev

Link to Webrev Comment

[bridgekeeper]

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

@dholmes-ora 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:

8373837: "assert(thread->is_VM_thread() || thread->is_Java_thread()) failed: Must be VMThread or JavaThread" on macosx-aarch64-26

Reviewed-by: fbredberg, coleenp

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

• f88cbfb: 8374044: Docs build fails: Cannot determine current path
• 8a93658: 8371284: GenShen: Avoid unnecessary card marking
• 6cbfc76: 8370249: Test jdk/javadoc/doccheck/checks/jdkCheckLinks.java fails due to JVMS/JLS links after JDK-8349681
• ... and 23 more: https://git.openjdk.org/jdk/compare/e75726ee03ca4664827ca5d680c02bcf2a96f4ea...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]

@dholmes-ora The following label will be automatically applied to this pull request:

• hotspot-runtime

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.

[mlbridge]

Webrevs

• 00: Full (9437bfda)

[fbredber]

Looks good to me.

[coleenp]

This is a small window for a race. The fix looks reasonable.

[dholmes-ora]

Thanks for the reviews @fbredber and @coleenp !

/integrate

[openjdk]

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

• 6231646: 8373208: Make Atomic class template constant initializable
• f88cbfb: 8374044: Docs build fails: Cannot determine current path
• 8a93658: 8371284: GenShen: Avoid unnecessary card marking
• ... and 24 more: https://git.openjdk.org/jdk/compare/e75726ee03ca4664827ca5d680c02bcf2a96f4ea...master

Your commit was automatically rebased without conflicts.

[openjdk]

@dholmes-ora Pushed as commit f0add88.

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