[riscv64-8u]c1_CodeStubs_riscv.cpp:242:23: error: ‘_trap_request’ was not declared in this scope

[sendaoYan]

+ cd build/linux-riscv64-normal-server-release/hotspot/linux_riscv_compiler2/generated
+ bash -c '/usr/bin/g++ -DLINUX -D_GNU_SOURCE -DRISCV64 -DPRODUCT -I. -I/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/share/vm/prims -I/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/share/vm -I/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/share/vm/precompiled -I/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/cpu/riscv/vm -I/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/os_cpu/linux_riscv/vm -I/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/os/linux/vm -I/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/os/posix/vm -I../generated -DHOTSPOT_RELEASE_VERSION="\"25.412-b00\"" -DHOTSPOT_BUILD_TARGET="\"product\"" -DHOTSPOT_BUILD_USER="\"yansendao\"" -DHOTSPOT_LIB_ARCH=\"riscv64\" -DHOTSPOT_VM_DISTRO="\"OpenJDK\""  -DTARGET_OS_FAMILY_linux -DTARGET_ARCH_riscv -DTARGET_ARCH_MODEL_riscv -DTARGET_OS_ARCH_linux_riscv -DTARGET_OS_ARCH_MODEL_linux_riscv64 -DTARGET_COMPILER_gcc -DINCLUDE_JFR=1 -DCOMPILER2 -DCOMPILER1 -fPIC -fno-rtti -fno-exceptions -D_REENTRANT -fcheck-new -fvisibility=hidden  -pipe -fno-strict-aliasing  -fno-omit-frame-pointer -O3  -g -DVM_LITTLE_ENDIAN -D_LP64=1 -Werror -Wpointer-arith -Wsign-compare -Wundef -Wunused-function -Wunused-value -Wformat=2 -Wreturn-type   -fstack-protector  -fno-delete-null-pointer-checks -fno-lifetime-dse -std=gnu++98 -DDTRACE_ENABLED -c -MMD -MP -MF ../generated/dependencies/c1_CodeStubs_riscv.o.d -fpch-deps -o c1_CodeStubs_riscv.o /home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/cpu/riscv/vm/c1_CodeStubs_riscv.cpp'
/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/cpu/riscv/vm/c1_CodeStubs_riscv.cpp: In member function ‘virtual void DeoptimizeStub::emit_code(LIR_Assembler*)’:
/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/cpu/riscv/vm/c1_CodeStubs_riscv.cpp:242:23: error: ‘_trap_request’ was not declared in this scope
  242 |   ce->store_parameter(_trap_request, 0);
      |                       ^~~~~~~~~~~~~

make-aarch64-fastdebug.log make-aarch64-release.log make-aarch64-slowdebug.log make-riscv64-fastdebug.log make-riscv64-release.log make-riscv64-slowdebug.log make-x86_64-fastdebug.log make-x86_64-release.log make-x86_64-slowdebug.log standalone.log

[sendaoYan]

8146891: AArch64 needs patch for 8032463

[sendaoYan]

JDK-8146891.patch

[sendaoYan]

diff --git a/hotspot/src/cpu/riscv/vm/c1_CodeStubs_riscv.cpp b/hotspot/src/cpu/riscv/vm/c1_CodeStubs_riscv.cpp
index a7486a36120..9fb92a87b8c 100644
--- a/hotspot/src/cpu/riscv/vm/c1_CodeStubs_riscv.cpp
+++ b/hotspot/src/cpu/riscv/vm/c1_CodeStubs_riscv.cpp
@@ -239,7 +239,6 @@ void PatchingStub::emit_code(LIR_Assembler* ce) {

 void DeoptimizeStub::emit_code(LIR_Assembler* ce) {
   __ bind(_entry);
-  ce->store_parameter(_trap_request, 0);
   __ far_call(RuntimeAddress(Runtime1::entry_for(Runtime1::deoptimize_id)));
   ce->add_call_info_here(_info);
   DEBUG_ONLY(__ should_not_reach_here());
diff --git a/hotspot/src/cpu/riscv/vm/c1_Runtime1_riscv.cpp b/hotspot/src/cpu/riscv/vm/c1_Runtime1_riscv.cpp
index c7331fea8d5..d750ce78ba0 100644
--- a/hotspot/src/cpu/riscv/vm/c1_Runtime1_riscv.cpp
+++ b/hotspot/src/cpu/riscv/vm/c1_Runtime1_riscv.cpp
@@ -1064,8 +1064,7 @@ OopMapSet* Runtime1::generate_code_for(StubID id, StubAssembler* sasm) {
         StubFrame f(sasm, "deoptimize", dont_gc_arguments);
         OopMap* oop_map = save_live_registers(sasm);
         assert_cond(oop_map != NULL);
-        f.load_argument(0, c_rarg1);
-        int call_offset = __ call_RT(noreg, noreg, CAST_FROM_FN_PTR(address, deoptimize), c_rarg1);
+        int call_offset = __ call_RT(noreg, noreg, CAST_FROM_FN_PTR(address, deoptimize));

         oop_maps = new OopMapSet();
         assert_cond(oop_maps != NULL);

standalone.log 53.patch

[sendaoYan]

To github.com:sendaoYan/riscv-port-jdk8u-ysd.git d27aed74a31..56f68694384 minus-jbs8276799 -> minus-jbs8276799

[sendaoYan]

make-aarch64-fastdebug.log make-aarch64-release.log make-aarch64-slowdebug.log make-riscv64-fastdebug.log make-riscv64-release.log make-riscv64-slowdebug.log make-x86_64-fastdebug.log make-x86_64-release.log make-x86_64-slowdebug.log