RFR: 8313438: [s390x] build broken after JDK-8301996 [v2]

[Lutz Schmidt]

On Thu, 5 Oct 2023 10:18:11 GMT, Amit Kumar <amitkumar at openjdk.org> wrote:

>> Build Fix after JDK-8301996. 
>> 
>> Warnings related to new Lightweight locking scheme are seen during the build phase, but we will get rid of them, after integrating #14414 . Testing done for `release-vm`, `slowdebug-vm`, `fastdebug-vm` and `optimized-vm`.
>> 
>> 3 Test failures seen on s390x are un-related to these changes.
>> 
>> jdk/jshell/ClassMembersTest.java
>> java/lang/invoke/condy/CondyWrongType.java
>> java/lang/invoke/condy/CondyWithGarbageTest.java
>> 
>> JBS issue for test failures: [JDK-8317581](https://bugs.openjdk.org/browse/JDK-8317581).
>
> Amit Kumar has updated the pull request with a new target base due to a merge or a rebase. The pull request now contains one commit:
> 
>   s390 Invoke Field Port

Changes requested by lucy (Reviewer).

src/hotspot/cpu/s390/templateTable_s390.cpp line 84:

> 82:     if (tos_state != Z_R0_scratch) {                                           \
> 83:       __ z_slgr(br_tab_temp, tos_state); /* to calculated branch target.     */\
> 84:     }                                                                          \

Remove this if() block, please.

src/hotspot/cpu/s390/templateTable_s390.cpp line 2711:

> 2709:     } else {
> 2710:       __ z_bc(Assembler::bcondAlways, 0, tos_state, br_tab);
> 2711:     }

Remove the if - else, please. Use the code in the if branch in all cases. Maybe assert tos_state != Z_R0_scratch.

src/hotspot/cpu/s390/templateTable_s390.cpp line 3047:

> 3045:     } else {
> 3046:       __ z_bc(Assembler::bcondAlways, 0, tos_state, br_tab);
> 3047:     }

Remove the if - else, please. Use the code in the if branch in all cases. Maybe assert tos_state != Z_R0_scratch.

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

PR Review: https://git.openjdk.org/jdk/pull/15885#pullrequestreview-1661357106
PR Review Comment: https://git.openjdk.org/jdk/pull/15885#discussion_r1348401387
PR Review Comment: https://git.openjdk.org/jdk/pull/15885#discussion_r1348406259
PR Review Comment: https://git.openjdk.org/jdk/pull/15885#discussion_r1348407083