Skip to content

Commit 9d2fa8f

Browse files
albertnetymkalbertnetymk
committed
8371321: Remove unused last arg of BarrierSetAssembler::arraycopy_epilogue
Reviewed-by: fandreuzzi, tschatzl
1 parent 1142d29 commit 9d2fa8f

16 files changed

+32
-38
lines changed

‎src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,7 @@ void G1BarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembler* mas
9090
DecoratorSet decorators,
9191
Register start,
9292
Register count,
93-
Register scratch,
94-
RegSet saved_regs) {
93+
Register scratch) {
9594

9695
Label done;
9796
Label loop;

‎src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class G1BarrierSetAssembler: public CardTableBarrierSetAssembler {
3939
void gen_write_ref_array_pre_barrier(MacroAssembler* masm, DecoratorSet decorators,
4040
Register addr, Register count, RegSet saved_regs);
4141
void gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
42-
Register start, Register count, Register tmp, RegSet saved_regs);
42+
Register start, Register count, Register tmp);
4343

4444
void g1_write_barrier_pre(MacroAssembler* masm,
4545
Register obj,

‎src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class BarrierSetAssembler: public CHeapObj<mtGC> {
4747
virtual void arraycopy_prologue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
4848
Register src, Register dst, Register count, RegSet saved_regs) {}
4949
virtual void arraycopy_epilogue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
50-
Register start, Register count, Register tmp, RegSet saved_regs) {}
50+
Register start, Register count, Register tmp) {}
5151

5252
virtual void copy_load_at(MacroAssembler* masm,
5353
DecoratorSet decorators,

‎src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.cpp‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,9 @@ void CardTableBarrierSetAssembler::arraycopy_prologue(MacroAssembler* masm, Deco
4141
}
4242

4343
void CardTableBarrierSetAssembler::arraycopy_epilogue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
44-
Register start, Register count, Register tmp,
45-
RegSet saved_regs) {
44+
Register start, Register count, Register tmp) {
4645
if (is_oop) {
47-
gen_write_ref_array_post_barrier(masm, decorators, start, count, tmp, saved_regs);
46+
gen_write_ref_array_post_barrier(masm, decorators, start, count, tmp);
4847
}
4948
}
5049

@@ -80,7 +79,7 @@ void CardTableBarrierSetAssembler::store_check(MacroAssembler* masm, Register ob
8079
}
8180

8281
void CardTableBarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
83-
Register start, Register count, Register scratch, RegSet saved_regs) {
82+
Register start, Register count, Register scratch) {
8483
Label L_loop, L_done;
8584
const Register end = count;
8685

‎src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ class CardTableBarrierSetAssembler: public BarrierSetAssembler {
3434
Register addr, Register count, RegSet saved_regs) {}
3535

3636
virtual void gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
37-
Register start, Register count, Register tmp, RegSet saved_regs);
37+
Register start, Register count, Register tmp);
3838
virtual void oop_store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
3939
Address dst, Register val, Register tmp1, Register tmp2, Register tmp3);
4040

4141
virtual void arraycopy_prologue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
4242
Register src, Register dst, Register count, RegSet saved_regs);
4343

4444
virtual void arraycopy_epilogue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
45-
Register start, Register count, Register tmp, RegSet saved_regs);
45+
Register start, Register count, Register tmp);
4646
virtual void store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
4747
Address dst, Register val, Register tmp1, Register tmp2, Register tmp3);
4848

‎src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ void ShenandoahBarrierSetAssembler::arraycopy_prologue(MacroAssembler* masm, Dec
7979
}
8080

8181
void ShenandoahBarrierSetAssembler::arraycopy_epilogue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
82-
Register start, Register count, Register tmp, RegSet saved_regs) {
82+
Register start, Register count, Register tmp) {
8383
if (ShenandoahCardBarrier && is_oop) {
84-
gen_write_ref_array_post_barrier(masm, decorators, start, count, tmp, saved_regs);
84+
gen_write_ref_array_post_barrier(masm, decorators, start, count, tmp);
8585
}
8686
}
8787

@@ -607,7 +607,7 @@ void ShenandoahBarrierSetAssembler::cmpxchg_oop(MacroAssembler* masm,
607607
}
608608

609609
void ShenandoahBarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
610-
Register start, Register count, Register scratch, RegSet saved_regs) {
610+
Register start, Register count, Register scratch) {
611611
assert(ShenandoahCardBarrier, "Should have been checked by caller");
612612

613613
Label L_loop, L_done;

‎src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ class ShenandoahBarrierSetAssembler: public BarrierSetAssembler {
6464

6565
void gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
6666
Register start, Register count,
67-
Register scratch, RegSet saved_regs);
67+
Register scratch);
6868

6969
public:
7070
virtual NMethodPatchingType nmethod_patching_type() { return NMethodPatchingType::conc_instruction_and_data_patch; }
@@ -79,7 +79,7 @@ class ShenandoahBarrierSetAssembler: public BarrierSetAssembler {
7979
virtual void arraycopy_prologue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
8080
Register src, Register dst, Register count, RegSet saved_regs);
8181
virtual void arraycopy_epilogue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
82-
Register start, Register count, Register tmp, RegSet saved_regs);
82+
Register start, Register count, Register tmp);
8383
virtual void load_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
8484
Register dst, Address src, Register tmp1, Register tmp2);
8585
virtual void store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,

‎src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1647,7 +1647,7 @@ class StubGenerator: public StubCodeGenerator {
16471647
verify_oop_array(size, d, count, r16);
16481648
}
16491649

1650-
bs->arraycopy_epilogue(_masm, decorators, is_oop, d, count, rscratch1, RegSet());
1650+
bs->arraycopy_epilogue(_masm, decorators, is_oop, d, count, rscratch1);
16511651

16521652
__ leave();
16531653
__ mov(r0, zr); // return 0
@@ -1807,7 +1807,7 @@ class StubGenerator: public StubCodeGenerator {
18071807
if (VerifyOops)
18081808
verify_oop_array(size, d, count, r16);
18091809
}
1810-
bs->arraycopy_epilogue(_masm, decorators, is_oop, d, count, rscratch1, RegSet());
1810+
bs->arraycopy_epilogue(_masm, decorators, is_oop, d, count, rscratch1);
18111811
__ leave();
18121812
__ mov(r0, zr); // return 0
18131813
__ ret(lr);
@@ -1874,7 +1874,6 @@ class StubGenerator: public StubCodeGenerator {
18741874
const Register ckval = c_rarg4; // super_klass
18751875

18761876
RegSet wb_pre_saved_regs = RegSet::range(c_rarg0, c_rarg4);
1877-
RegSet wb_post_saved_regs = RegSet::of(count);
18781877

18791878
// Registers used as temps (r19, r20, r21, r22 are save-on-entry)
18801879
const Register copied_oop = r22; // actual oop copied
@@ -2000,7 +1999,7 @@ class StubGenerator: public StubCodeGenerator {
20001999
__ br(Assembler::EQ, L_done_pop);
20012000

20022001
__ BIND(L_do_card_marks);
2003-
bs->arraycopy_epilogue(_masm, decorators, is_oop, start_to, count_save, rscratch1, wb_post_saved_regs);
2002+
bs->arraycopy_epilogue(_masm, decorators, is_oop, start_to, count_save, rscratch1);
20042003

20052004
__ bind(L_done_pop);
20062005
__ pop(RegSet::of(r19, r20, r21, r22), sp);

‎src/hotspot/cpu/riscv/gc/g1/g1BarrierSetAssembler_riscv.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,7 @@ void G1BarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembler* mas
9191
DecoratorSet decorators,
9292
Register start,
9393
Register count,
94-
Register tmp,
95-
RegSet saved_regs) {
94+
Register tmp) {
9695
assert_different_registers(start, count, tmp);
9796

9897
Label loop, next, done;

‎src/hotspot/cpu/riscv/gc/g1/g1BarrierSetAssembler_riscv.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class G1BarrierSetAssembler: public CardTableBarrierSetAssembler {
4242
void gen_write_ref_array_pre_barrier(MacroAssembler* masm, DecoratorSet decorators,
4343
Register addr, Register count, RegSet saved_regs);
4444
void gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
45-
Register start, Register count, Register tmp, RegSet saved_regs);
45+
Register start, Register count, Register tmp);
4646

4747
void g1_write_barrier_pre(MacroAssembler* masm,
4848
Register obj,

0 commit comments

Comments
 (0)