[jdk17u-dev] Integrated: 8314225: SIGSEGV in JavaThread::is_lock_owned

[Goetz Lindenmaier]

On Sun, 29 Dec 2024 18:02:48 GMT, Goetz Lindenmaier <goetz at openjdk.org> wrote:

> I backport this for parity with 17.0.15-oracle.
> 
> I had to resolve the larger part of this change. 
> None of my edits change the code essentially, though.
> 
> src/hotspot/share/jfr/leakprofiler/checkpoint/rootResolver.cpp
> Resolved because of NULL/nullptr difference
> 
> src/hotspot/share/runtime/javaThread.cpp|hpp
> These files don't exist in 17, they were split off from thread.cpp|hpp.
> The modiefied code looks very similar in 17, so I could easily identify 
> the changed code and apply the patches.  Usual minor nullptr diffs etc.
> 
> src/hotspot/share/runtime/monitorChunk.cpp
> Resolved because of NULL/nullptr difference
> 
> src/hotspot/share/runtime/monitorChunk.hpp
> Resolved because of context diff.
> 
> src/hotspot/share/runtime/synchronizer.cpp
> Resolved. Different checks in if condition.
> One is for the new locking mode in head, the other whether the mask has a locker.
> ... check ...
> 
> src/hotspot/share/runtime/thread.cpp
> Resolved because new locking modes added an assertion in removed function is_lock_owned.
> 
> src/hotspot/share/runtime/vframeArray.cpp
> Resolved. Code differs because 21 has biased locking removed.
> 
> 
> 
> To make it build, I had to replace
> Javathread::cast() by as_Java_thread() in synchronizer.cpp.
> 
> Also I removed is_linked() from monitorChunk.hpp.

This pull request has now been integrated.

Changeset: 7c825dd4
Author:    Goetz Lindenmaier <goetz at openjdk.org>
URL:       https://git.openjdk.org/jdk17u-dev/commit/7c825dd41eb5078bf26546e891bc7106aab0a089
Stats:     100 lines in 9 files changed: 13 ins; 73 del; 14 mod

8314225: SIGSEGV in JavaThread::is_lock_owned

Reviewed-by: rrich
Backport-of: ad0b54d429fdbd806c09aa06bb42f1ed4a0297e8

-------------

PR: https://git.openjdk.org/jdk17u-dev/pull/3177