RFR: 8294190: Incorrect check messages in SharedRuntime::generate_uncommon_trap_blob [v2]

[Dean Long]

On Thu, 22 Sep 2022 08:36:32 GMT, Aleksey Shipilev <shade at openjdk.org> wrote:

>> The checks added by [JDK-8141133](https://bugs.openjdk.org/browse/JDK-8141133) are not consistent. The blocks that verify `Deoptimization::Unpack_uncommon_trap` kind are saying "last_Java_fp not cleared" for some arches.
>
> Aleksey Shipilev has updated the pull request incrementally with one additional commit since the last revision:
> 
>   generate_deopt_blob -> generate_uncommon_trap_blob

Marked as reviewed by dlong (Reviewer).

src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp line 2554:

> 2552:     __ cmpw(rscratch1, (unsigned)Deoptimization::Unpack_uncommon_trap);
> 2553:     __ br(Assembler::EQ, L);
> 2554:     __ stop("SharedRuntime::generate_deopt_blob: expected Unpack_uncommon_trap");

Suggestion:

    __ stop("SharedRuntime::generate_uncommon_trap_blob: expected Unpack_uncommon_trap");

src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp line 2069:

> 2067:     __ mvw(t1, Deoptimization::Unpack_uncommon_trap);
> 2068:     __ beq(t0, t1, L);
> 2069:     __ stop("SharedRuntime::generate_deopt_blob: expected Unpack_uncommon_trap");

Suggestion:

    __ stop("SharedRuntime::generate_uncommon_trap_blob: expected Unpack_uncommon_trap");

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

PR: https://git.openjdk.org/jdk/pull/10388