On Sun, 9 Aug 2026 06:21:17 GMT, Amit Kumar <[email protected]> wrote:
>> Fredrik Bredberg has updated the pull request with a new target base due to
>> a merge or a rebase. The incremental webrev excludes the unrelated changes
>> brought in by the merge/rebase. The pull request contains three additional
>> commits since the last revision:
>>
>> - Updated after review
>> - Merge branch 'master' into 8389325_remove_use_object_monitor_table_flag
>> - 8389325: Remove the UseObjectMonitorTable flag and related code
>
> You might want to merge the master branch, It seems there is one more
> instance added in valhalla.
>
> ```diff
> diff --git a/src/hotspot/cpu/s390/macroAssembler_s390.cpp
> b/src/hotspot/cpu/s390/macroAssembler_s390.cpp
> index 08ae5af194c..e8971e7630e 100644
> --- a/src/hotspot/cpu/s390/macroAssembler_s390.cpp
> +++ b/src/hotspot/cpu/s390/macroAssembler_s390.cpp
> @@ -4265,15 +4265,6 @@ void MacroAssembler::test_oop_prototype_bit(Register
> oop, Register temp_reg, int
> assert(test_bit <= 0xFFFF, "must fit in low 16 bits for z_tmll");
> // Load mark word
> z_lg(temp_reg, oopDesc::mark_offset_in_bytes(), oop);
> - if (!UseObjectMonitorTable) {
> - Label test_mark_word;
> - // If unlocked bit is set we can directly use the mark word
> - z_tmll(temp_reg, markWord::unlocked_value);
> - z_brnaz(test_mark_word);
> - // Slow path: use klass prototype
> - load_prototype_header(temp_reg, oop);
> - bind(test_mark_word);
> - }
> z_tmll(temp_reg, test_bit);
> // Use branch_optimized to handle both near and far branches automatically
> branch_optimized(jmp_set ? Assembler::bcondNotAllZero :
> Assembler::bcondAllZero, jmp_label);
>
>
> With above diff, I did testing on s390x, and result look clean.
@offamitkumar
I merged in master, removed the suggested lines, recompiled and ran
`UseObjectMonitorTableTest.java` on `s390x` using QEMU. Looks good. Thank you
for spotting this.
-------------
PR Comment: https://git.openjdk.org/jdk/pull/32257#issuecomment-5250968145
