Open sendaoYan opened 1 month ago
8146891: AArch64 needs patch for 8032463
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);
To github.com:sendaoYan/riscv-port-jdk8u-ysd.git d27aed74a31..56f68694384 minus-jbs8276799 -> minus-jbs8276799
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