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

[Fei Yang]

On Thu, 1 Aug 2024 21:58:51 GMT, Andrew Dinn <adinn at openjdk.org> wrote:

>> Reorganization of generation and management code for C2-specific blob so that it is, as far as possible, under the scope of class OptoRuntime with an implementation located in C2-specific source files.
>
> 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

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

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