8295457: Make the signatures of write barrier methods consistent

caizixian · shipilev · commit 5dbd49511518 · 2022-10-18T15:32:20.000Z
Reviewed-by: tschatzl, shade
diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
@@ -4393,15 +4393,15 @@ void MacroAssembler::access_load_at(BasicType type, DecoratorSet decorators,
 }
 
 void MacroAssembler::access_store_at(BasicType type, DecoratorSet decorators,
-                                     Address dst, Register src,
+                                     Address dst, Register val,
                                      Register tmp1, Register tmp2, Register tmp3) {
   BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
   decorators = AccessInternal::decorator_fixup(decorators);
   bool as_raw = (decorators & AS_RAW) != 0;
   if (as_raw) {
-    bs->BarrierSetAssembler::store_at(this, decorators, type, dst, src, tmp1, tmp2, tmp3);
+    bs->BarrierSetAssembler::store_at(this, decorators, type, dst, val, tmp1, tmp2, tmp3);
   } else {
-    bs->store_at(this, decorators, type, dst, src, tmp1, tmp2, tmp3);
+    bs->store_at(this, decorators, type, dst, val, tmp1, tmp2, tmp3);
   }
 }
 
@@ -4415,9 +4415,9 @@ void MacroAssembler::load_heap_oop_not_null(Register dst, Address src, Register
   access_load_at(T_OBJECT, IN_HEAP | IS_NOT_NULL | decorators, dst, src, tmp1, tmp2);
 }
 
-void MacroAssembler::store_heap_oop(Address dst, Register src, Register tmp1,
+void MacroAssembler::store_heap_oop(Address dst, Register val, Register tmp1,
                                     Register tmp2, Register tmp3, DecoratorSet decorators) {
-  access_store_at(T_OBJECT, IN_HEAP | decorators, dst, src, tmp1, tmp2, tmp3);
+  access_store_at(T_OBJECT, IN_HEAP | decorators, dst, val, tmp1, tmp2, tmp3);
 }
 
 // Used for storing NULLs.
diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
@@ -843,15 +843,15 @@ class MacroAssembler: public Assembler {
   void access_load_at(BasicType type, DecoratorSet decorators, Register dst, Address src,
                       Register tmp1, Register tmp2);
 
-  void access_store_at(BasicType type, DecoratorSet decorators, Address dst, Register src,
+  void access_store_at(BasicType type, DecoratorSet decorators, Address dst, Register val,
                        Register tmp1, Register tmp2, Register tmp3);
 
   void load_heap_oop(Register dst, Address src, Register tmp1,
                      Register tmp2, DecoratorSet decorators = 0);
 
   void load_heap_oop_not_null(Register dst, Address src, Register tmp1,
                               Register tmp2, DecoratorSet decorators = 0);
-  void store_heap_oop(Address dst, Register src, Register tmp1,
+  void store_heap_oop(Address dst, Register val, Register tmp1,
                       Register tmp2, Register tmp3, DecoratorSet decorators = 0);
 
   // currently unimplemented
diff --git a/src/hotspot/cpu/ppc/macroAssembler_ppc.inline.hpp b/src/hotspot/cpu/ppc/macroAssembler_ppc.inline.hpp
@@ -398,11 +398,11 @@ inline void MacroAssembler::load_heap_oop(Register d, RegisterOrConstant offs, R
                  preservation_level, L_handle_null);
 }
 
-inline void MacroAssembler::store_heap_oop(Register d, RegisterOrConstant offs, Register s1,
+inline void MacroAssembler::store_heap_oop(Register val, RegisterOrConstant offs, Register base,
                                            Register tmp1, Register tmp2, Register tmp3,
                                            MacroAssembler::PreservationLevel preservation_level,
                                            DecoratorSet decorators) {
-  access_store_at(T_OBJECT, decorators | IN_HEAP, s1, offs, d, tmp1, tmp2, tmp3, preservation_level);
+  access_store_at(T_OBJECT, decorators | IN_HEAP, base, offs, val, tmp1, tmp2, tmp3, preservation_level);
 }
 
 inline Register MacroAssembler::encode_heap_oop_not_null(Register d, Register src) {
diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
@@ -2094,15 +2094,15 @@ void MacroAssembler::null_check(Register reg, int offset) {
 }
 
 void MacroAssembler::access_store_at(BasicType type, DecoratorSet decorators,
-                                     Address dst, Register src,
+                                     Address dst, Register val,
                                      Register tmp1, Register tmp2, Register tmp3) {
   BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
   decorators = AccessInternal::decorator_fixup(decorators);
   bool as_raw = (decorators & AS_RAW) != 0;
   if (as_raw) {
-    bs->BarrierSetAssembler::store_at(this, decorators, type, dst, src, tmp1, tmp2, tmp3);
+    bs->BarrierSetAssembler::store_at(this, decorators, type, dst, val, tmp1, tmp2, tmp3);
   } else {
-    bs->store_at(this, decorators, type, dst, src, tmp1, tmp2, tmp3);
+    bs->store_at(this, decorators, type, dst, val, tmp1, tmp2, tmp3);
   }
 }
 
@@ -2269,9 +2269,9 @@ void  MacroAssembler::decode_heap_oop(Register d, Register s) {
   verify_oop_msg(d, "broken oop in decode_heap_oop");
 }
 
-void MacroAssembler::store_heap_oop(Address dst, Register src, Register tmp1,
+void MacroAssembler::store_heap_oop(Address dst, Register val, Register tmp1,
                                     Register tmp2, Register tmp3, DecoratorSet decorators) {
-  access_store_at(T_OBJECT, IN_HEAP | decorators, dst, src, tmp1, tmp2, tmp3);
+  access_store_at(T_OBJECT, IN_HEAP | decorators, dst, val, tmp1, tmp2, tmp3);
 }
 
 void MacroAssembler::load_heap_oop(Register dst, Address src, Register tmp1,
diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
@@ -191,7 +191,7 @@ class MacroAssembler: public Assembler {
   void access_load_at(BasicType type, DecoratorSet decorators, Register dst,
                       Address src, Register tmp1, Register tmp2);
   void access_store_at(BasicType type, DecoratorSet decorators, Address dst,
-                       Register src, Register tmp1, Register tmp2, Register tmp3);
+                       Register val, Register tmp1, Register tmp2, Register tmp3);
   void load_klass(Register dst, Register src);
   void store_klass(Register dst, Register src);
   void cmp_klass(Register oop, Register trial_klass, Register tmp, Label &L);
@@ -210,7 +210,7 @@ class MacroAssembler: public Assembler {
                      Register tmp2 = noreg, DecoratorSet decorators = 0);
   void load_heap_oop_not_null(Register dst, Address src, Register tmp1 = noreg,
                               Register tmp2 = noreg, DecoratorSet decorators = 0);
-  void store_heap_oop(Address dst, Register src, Register tmp1 = noreg,
+  void store_heap_oop(Address dst, Register val, Register tmp1 = noreg,
                       Register tmp2 = noreg, Register tmp3 = noreg, DecoratorSet decorators = 0);
 
   void store_klass_gap(Register dst, Register src);
diff --git a/src/hotspot/cpu/x86/macroAssembler_x86.cpp b/src/hotspot/cpu/x86/macroAssembler_x86.cpp
@@ -5104,15 +5104,15 @@ void MacroAssembler::access_load_at(BasicType type, DecoratorSet decorators, Reg
   }
 }
 
-void MacroAssembler::access_store_at(BasicType type, DecoratorSet decorators, Address dst, Register src,
+void MacroAssembler::access_store_at(BasicType type, DecoratorSet decorators, Address dst, Register val,
                                      Register tmp1, Register tmp2, Register tmp3) {
   BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
   decorators = AccessInternal::decorator_fixup(decorators);
   bool as_raw = (decorators & AS_RAW) != 0;
   if (as_raw) {
-    bs->BarrierSetAssembler::store_at(this, decorators, type, dst, src, tmp1, tmp2, tmp3);
+    bs->BarrierSetAssembler::store_at(this, decorators, type, dst, val, tmp1, tmp2, tmp3);
   } else {
-    bs->store_at(this, decorators, type, dst, src, tmp1, tmp2, tmp3);
+    bs->store_at(this, decorators, type, dst, val, tmp1, tmp2, tmp3);
   }
 }
 
@@ -5127,9 +5127,9 @@ void MacroAssembler::load_heap_oop_not_null(Register dst, Address src, Register
   access_load_at(T_OBJECT, IN_HEAP | IS_NOT_NULL | decorators, dst, src, tmp1, thread_tmp);
 }
 
-void MacroAssembler::store_heap_oop(Address dst, Register src, Register tmp1,
+void MacroAssembler::store_heap_oop(Address dst, Register val, Register tmp1,
                                     Register tmp2, Register tmp3, DecoratorSet decorators) {
-  access_store_at(T_OBJECT, IN_HEAP | decorators, dst, src, tmp1, tmp2, tmp3);
+  access_store_at(T_OBJECT, IN_HEAP | decorators, dst, val, tmp1, tmp2, tmp3);
 }
 
 // Used for storing NULLs.
diff --git a/src/hotspot/cpu/x86/macroAssembler_x86.hpp b/src/hotspot/cpu/x86/macroAssembler_x86.hpp
@@ -352,14 +352,14 @@ class MacroAssembler: public Assembler {
 
   void access_load_at(BasicType type, DecoratorSet decorators, Register dst, Address src,
                       Register tmp1, Register thread_tmp);
-  void access_store_at(BasicType type, DecoratorSet decorators, Address dst, Register src,
+  void access_store_at(BasicType type, DecoratorSet decorators, Address dst, Register val,
                        Register tmp1, Register tmp2, Register tmp3);
 
   void load_heap_oop(Register dst, Address src, Register tmp1 = noreg,
                      Register thread_tmp = noreg, DecoratorSet decorators = 0);
   void load_heap_oop_not_null(Register dst, Address src, Register tmp1 = noreg,
                               Register thread_tmp = noreg, DecoratorSet decorators = 0);
-  void store_heap_oop(Address dst, Register src, Register tmp1 = noreg,
+  void store_heap_oop(Address dst, Register val, Register tmp1 = noreg,
                       Register tmp2 = noreg, Register tmp3 = noreg, DecoratorSet decorators = 0);
 
   // Used for storing NULL. All other oop constants should be

Original file line number	Diff line number	Diff line change
`@@ -4393,15 +4393,15 @@ void MacroAssembler::access_load_at(BasicType type, DecoratorSet decorators,`
`4393`	`4393`	`}`
`4394`	`4394`
`4395`	`4395`	`void MacroAssembler::access_store_at(BasicType type, DecoratorSet decorators,`
`4396`		`- Address dst, Register src,`
	`4396`	`+ Address dst, Register val,`
`4397`	`4397`	`Register tmp1, Register tmp2, Register tmp3) {`
`4398`	`4398`	`BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();`
`4399`	`4399`	`decorators = AccessInternal::decorator_fixup(decorators);`
`4400`	`4400`	`bool as_raw = (decorators & AS_RAW) != 0;`
`4401`	`4401`	`if (as_raw) {`
`4402`		`- bs->BarrierSetAssembler::store_at(this, decorators, type, dst, src, tmp1, tmp2, tmp3);`
	`4402`	`+ bs->BarrierSetAssembler::store_at(this, decorators, type, dst, val, tmp1, tmp2, tmp3);`
`4403`	`4403`	`} else {`
`4404`		`- bs->store_at(this, decorators, type, dst, src, tmp1, tmp2, tmp3);`
	`4404`	`+ bs->store_at(this, decorators, type, dst, val, tmp1, tmp2, tmp3);`
`4405`	`4405`	`}`
`4406`	`4406`	`}`
`4407`	`4407`
`@@ -4415,9 +4415,9 @@ void MacroAssembler::load_heap_oop_not_null(Register dst, Address src, Register`
`4415`	`4415`	`access_load_at(T_OBJECT, IN_HEAP \| IS_NOT_NULL \| decorators, dst, src, tmp1, tmp2);`
`4416`	`4416`	`}`
`4417`	`4417`
`4418`		`-void MacroAssembler::store_heap_oop(Address dst, Register src, Register tmp1,`
	`4418`	`+void MacroAssembler::store_heap_oop(Address dst, Register val, Register tmp1,`
`4419`	`4419`	`Register tmp2, Register tmp3, DecoratorSet decorators) {`
`4420`		`- access_store_at(T_OBJECT, IN_HEAP \| decorators, dst, src, tmp1, tmp2, tmp3);`
	`4420`	`+ access_store_at(T_OBJECT, IN_HEAP \| decorators, dst, val, tmp1, tmp2, tmp3);`
`4421`	`4421`	`}`
`4422`	`4422`
`4423`	`4423`	`// Used for storing NULLs.`
Original file line number	Diff line number	Diff line change
`@@ -398,11 +398,11 @@ inline void MacroAssembler::load_heap_oop(Register d, RegisterOrConstant offs, R`
`398`	`398`	`preservation_level, L_handle_null);`
`399`	`399`	`}`
`400`	`400`
`401`		`-inline void MacroAssembler::store_heap_oop(Register d, RegisterOrConstant offs, Register s1,`
	`401`	`+inline void MacroAssembler::store_heap_oop(Register val, RegisterOrConstant offs, Register base,`
`402`	`402`	`Register tmp1, Register tmp2, Register tmp3,`
`403`	`403`	`MacroAssembler::PreservationLevel preservation_level,`
`404`	`404`	`DecoratorSet decorators) {`
`405`		`- access_store_at(T_OBJECT, decorators \| IN_HEAP, s1, offs, d, tmp1, tmp2, tmp3, preservation_level);`
	`405`	`+ access_store_at(T_OBJECT, decorators \| IN_HEAP, base, offs, val, tmp1, tmp2, tmp3, preservation_level);`
`406`	`406`	`}`
`407`	`407`
`408`	`408`	`inline Register MacroAssembler::encode_heap_oop_not_null(Register d, Register src) {`
Original file line number	Diff line number	Diff line change
`@@ -2094,15 +2094,15 @@ void MacroAssembler::null_check(Register reg, int offset) {`
`2094`	`2094`	`}`
`2095`	`2095`
`2096`	`2096`	`void MacroAssembler::access_store_at(BasicType type, DecoratorSet decorators,`
`2097`		`- Address dst, Register src,`
	`2097`	`+ Address dst, Register val,`
`2098`	`2098`	`Register tmp1, Register tmp2, Register tmp3) {`
`2099`	`2099`	`BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();`
`2100`	`2100`	`decorators = AccessInternal::decorator_fixup(decorators);`
`2101`	`2101`	`bool as_raw = (decorators & AS_RAW) != 0;`
`2102`	`2102`	`if (as_raw) {`
`2103`		`- bs->BarrierSetAssembler::store_at(this, decorators, type, dst, src, tmp1, tmp2, tmp3);`
	`2103`	`+ bs->BarrierSetAssembler::store_at(this, decorators, type, dst, val, tmp1, tmp2, tmp3);`
`2104`	`2104`	`} else {`
`2105`		`- bs->store_at(this, decorators, type, dst, src, tmp1, tmp2, tmp3);`
	`2105`	`+ bs->store_at(this, decorators, type, dst, val, tmp1, tmp2, tmp3);`
`2106`	`2106`	`}`
`2107`	`2107`	`}`
`2108`	`2108`
`@@ -2269,9 +2269,9 @@ void MacroAssembler::decode_heap_oop(Register d, Register s) {`
`2269`	`2269`	`verify_oop_msg(d, "broken oop in decode_heap_oop");`
`2270`	`2270`	`}`
`2271`	`2271`
`2272`		`-void MacroAssembler::store_heap_oop(Address dst, Register src, Register tmp1,`
	`2272`	`+void MacroAssembler::store_heap_oop(Address dst, Register val, Register tmp1,`
`2273`	`2273`	`Register tmp2, Register tmp3, DecoratorSet decorators) {`
`2274`		`- access_store_at(T_OBJECT, IN_HEAP \| decorators, dst, src, tmp1, tmp2, tmp3);`
	`2274`	`+ access_store_at(T_OBJECT, IN_HEAP \| decorators, dst, val, tmp1, tmp2, tmp3);`
`2275`	`2275`	`}`
`2276`	`2276`
`2277`	`2277`	`void MacroAssembler::load_heap_oop(Register dst, Address src, Register tmp1,`
Original file line number	Diff line number	Diff line change
`@@ -5104,15 +5104,15 @@ void MacroAssembler::access_load_at(BasicType type, DecoratorSet decorators, Reg`
`5104`	`5104`	`}`
`5105`	`5105`	`}`
`5106`	`5106`
`5107`		`-void MacroAssembler::access_store_at(BasicType type, DecoratorSet decorators, Address dst, Register src,`
	`5107`	`+void MacroAssembler::access_store_at(BasicType type, DecoratorSet decorators, Address dst, Register val,`
`5108`	`5108`	`Register tmp1, Register tmp2, Register tmp3) {`
`5109`	`5109`	`BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();`
`5110`	`5110`	`decorators = AccessInternal::decorator_fixup(decorators);`
`5111`	`5111`	`bool as_raw = (decorators & AS_RAW) != 0;`
`5112`	`5112`	`if (as_raw) {`
`5113`		`- bs->BarrierSetAssembler::store_at(this, decorators, type, dst, src, tmp1, tmp2, tmp3);`
	`5113`	`+ bs->BarrierSetAssembler::store_at(this, decorators, type, dst, val, tmp1, tmp2, tmp3);`
`5114`	`5114`	`} else {`
`5115`		`- bs->store_at(this, decorators, type, dst, src, tmp1, tmp2, tmp3);`
	`5115`	`+ bs->store_at(this, decorators, type, dst, val, tmp1, tmp2, tmp3);`
`5116`	`5116`	`}`
`5117`	`5117`	`}`
`5118`	`5118`
`@@ -5127,9 +5127,9 @@ void MacroAssembler::load_heap_oop_not_null(Register dst, Address src, Register`
`5127`	`5127`	`access_load_at(T_OBJECT, IN_HEAP \| IS_NOT_NULL \| decorators, dst, src, tmp1, thread_tmp);`
`5128`	`5128`	`}`
`5129`	`5129`
`5130`		`-void MacroAssembler::store_heap_oop(Address dst, Register src, Register tmp1,`
	`5130`	`+void MacroAssembler::store_heap_oop(Address dst, Register val, Register tmp1,`
`5131`	`5131`	`Register tmp2, Register tmp3, DecoratorSet decorators) {`
`5132`		`- access_store_at(T_OBJECT, IN_HEAP \| decorators, dst, src, tmp1, tmp2, tmp3);`
	`5132`	`+ access_store_at(T_OBJECT, IN_HEAP \| decorators, dst, val, tmp1, tmp2, tmp3);`
`5133`	`5133`	`}`
`5134`	`5134`
`5135`	`5135`	`// Used for storing NULLs.`