Revert clinit_barrier

robehn · Oct 15, 2024 · 4beb12d · 4beb12d
1 parent ec28fe3
commit 4beb12d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp b/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp
@@ -96,8 +96,8 @@ void LIR_Assembler::clinit_barrier(ciMethod* method) {
 
   Label L_skip_barrier;
 
-  __ mov_metadata(t0, method->holder()->constant_encoding());
-  __ clinit_barrier(t0, t1, &L_skip_barrier /* L_fast_path */);
+  __ mov_metadata(t1, method->holder()->constant_encoding());
+  __ clinit_barrier(t1, t0, &L_skip_barrier /* L_fast_path */);
   __ far_jump(RuntimeAddress(SharedRuntime::get_handle_wrong_method_stub()));
   __ bind(L_skip_barrier);
 }

diff --git a/src/hotspot/cpu/riscv/riscv.ad b/src/hotspot/cpu/riscv/riscv.ad
@@ -1418,8 +1418,8 @@ void MachPrologNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {
 
     Label L_skip_barrier;
 
-    __ mov_metadata(t0, C->method()->holder()->constant_encoding());
-    __ clinit_barrier(t0, t1, &L_skip_barrier);
+    __ mov_metadata(t1, C->method()->holder()->constant_encoding());
+    __ clinit_barrier(t1, t0, &L_skip_barrier);
     __ far_jump(RuntimeAddress(SharedRuntime::get_handle_wrong_method_stub()));
     __ bind(L_skip_barrier);
   }