RFR: 8337654: Relocate uncommon trap stub from SharedRuntime to OptoRuntime [v3]

[Andrew Dinn]

On Fri, 2 Aug 2024 04:34:37 GMT, Fei Yang <fyang at openjdk.org> wrote:

>> Andrew Dinn has updated the pull request incrementally with one additional commit since the last revision:
>> 
>>   add new riscv source
>
> Hi Andrew, I think we are lacking following addon change for riscv. Built fastdebug and manually tested on linux-riscv64.
> 
> 
> diff --git a/src/hotspot/cpu/riscv/runtime_riscv.cpp b/src/hotspot/cpu/riscv/runtime_riscv.cpp
> index 46fdcc65a2c..c030441857c 100644
> --- a/src/hotspot/cpu/riscv/runtime_riscv.cpp
> +++ b/src/hotspot/cpu/riscv/runtime_riscv.cpp
> @@ -58,7 +58,7 @@ class SimpleRuntimeFrame {
>  #define __ masm->
> 
>  //------------------------------generate_uncommon_trap_blob--------------------
> -void SharedRuntime::generate_uncommon_trap_blob() {
> +void OptoRuntime::generate_uncommon_trap_blob() {
>    // Allocate space for the code
>    ResourceMark rm;
>    // Setup code generation tools
> @@ -122,7 +122,7 @@ void SharedRuntime::generate_uncommon_trap_blob() {
>      __ lwu(t0, Address(x14, Deoptimization::UnrollBlock::unpack_kind_offset()));
>      __ mv(t1, Deoptimization::Unpack_uncommon_trap);
>      __ beq(t0, t1, L);
> -    __ stop("SharedRuntime::generate_uncommon_trap_blob: expected Unpack_uncommon_trap");
> +    __ stop("OptoRuntime::generate_uncommon_trap_blob: expected Unpack_uncommon_trap");
>      __ bind(L);
>    }
>  #endif
> @@ -377,6 +377,5 @@ void OptoRuntime::generate_exception_blob() {
>    // Set exception blob
>    _exception_blob =  ExceptionBlob::create(&buffer, oop_maps, SimpleRuntimeFrame::framesize >> 1);
>  }
> -#endif // COMPILER2
> -
> 
> +#endif // COMPILER2

Hi Fei (@RealFYang). Thanks for checking. I pushed a corrected version.

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

PR Comment: https://git.openjdk.org/jdk/pull/20417#issuecomment-2265870940