RFR: 8298733: Reconsider monitors_on_stack assert [v2]
Patricio Chilano Mateo
pchilanomate at openjdk.org
Wed Apr 16 17:12:57 UTC 2025
On Wed, 16 Apr 2025 13:02:58 GMT, Fredrik Bredberg <fbredberg at openjdk.org> wrote:
>> This PR aims to revert this [8298371: monitors_on_stack extracts unprocessed oops](https://github.com/openjdk/jdk/pull/11582) fix at the same time as we retain the ability to assert that we don't have any monitors on the stack when legacy locking is used.
>>
>> It does so by moving an assert that ensures that we don't have any monitors on the stack to a place where all stack frames should have been processed. I.e. it's safe to check the frame for any monitor.
>>
>> A new function called assert_frames_in_continuation_are_safe() asserts that the frames has been processed (i.e. it safe to revert the [8298371](https://github.com/openjdk/jdk/pull/11582) fix). By keeping that assertion functionality separate from monitors_on_stack() we will be able to keep that assertion after we have removed legacy locking.
>>
>> In order to recreate the original [problem](https://github.com/openjdk/jdk/pull/11582) and verifying that this PR works used, I used:
>> `-XX:LockingMode=1 -XX:+UseZGC -XX:+ZVerifyOops -XX:ZCollectionIntervalMajor=0.001 Fuzz.java
>> `
>>
>> Also passes tier1-7.
>
> Fredrik Bredberg has updated the pull request incrementally with one additional commit since the last revision:
>
> Updated after Patricio's review
src/hotspot/share/runtime/continuationFreezeThaw.cpp line 578:
> 576: StackWatermark* watermark = StackWatermarkSet::get(thread, StackWatermarkKind::gc);
> 577: for (frame f = thread->last_frame(); Continuation::is_frame_in_continuation(ce, f); f = f.sender(&map)) {
> 578: if (watermark != nullptr) {
I meant also this nullptr check which can be done outside the loop. You could move it at the beginning of this method and just return if watermark is null.
-------------
PR Review Comment: https://git.openjdk.org/jdk/pull/24655#discussion_r2047375630
More information about the hotspot-runtime-dev
mailing list