src/hotspot/cpu/arm/stubGenerator_arm.cpp

rename things

 
 #include "precompiled.hpp"
 #include "asm/assembler.hpp"
 #include "assembler_arm.inline.hpp"
 #include "gc/shared/barrierSet.hpp"
-#include "gc/shared/barrierSetCodeGen.hpp"
+#include "gc/shared/barrierSetAssembler.hpp"
 #include "interpreter/interpreter.hpp"
 #include "nativeInst_arm.hpp"
 #include "oops/instanceOop.hpp"
 #include "oops/method.hpp"
 #include "oops/objArrayKlass.hpp"

@@ -2874,13 +2874,12
       __ sub_ptr_scaled_int32(to, to, count, LogBytesPerHeapOop);
     }
 
     // 'to' is the beginning of the region
 
-    BarrierSet *bs = BarrierSet::barrier_set();
-    BarrierSetCodeGen *code_gen = bs->code_gen();
-    code_gen->arraycopy_epilogue(this, decorators, true, to, count, tmp);
+    BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
+    bs->arraycopy_epilogue(this, decorators, true, to, count, tmp);
 
     if (status) {
       __ mov(R0, 0); // OK
     }
 

@@ -2952,13 +2951,12
     }
     if (aligned) {
       decorators |= ARRAYCOPY_ALIGNED;
     }
 
-    BarrierSet *bs = BarrierSet::barrier_set();
-    BarrierSetCodeGen *code_gen = bs->code_gen();
-    code_gen->arraycopy_prologue(this, decorators, true, to, count, callee_saved_regs);
+    BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
+    bs->arraycopy_prologue(this, decorators, true, to, count, callee_saved_regs);
 
     // save arguments for barrier generation (after the pre barrier)
     __ mov(saved_count, count);
 
     if (!forward) {

@@ -3219,13 +3217,12
     pushed+=1;
 #endif // AARCH64
 
     DecoratorSet decorators = ARRAYCOPY_CHECKCAST;
 
-    BarrierSet *bs = BarrierSet::barrier_set();
-    BarrierSetCodeGen *code_gen = bs->code_gen();
-    code_gen->arraycopy_prologue(this, decorators, true, to, count, callee_saved_regs);
+    BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
+    bs->arraycopy_prologue(this, decorators, true, to, count, callee_saved_regs);
 
 #ifndef AARCH64
     const RegisterSet caller_saved_regs = RegisterSet(R4,R6) | RegisterSet(R8,R9) | altFP_7_11;
     __ push(caller_saved_regs);
     assert(caller_saved_regs.size() == 6, "check the count");

@@ -3299,11 +3296,11
     __ subs_32(copied, saved_count, count); // copied count (in saved reg)
     __ b(L_not_copied, eq); // nothing was copied, skip post barrier
     __ sub(to, to, AsmOperand(copied, lsl, LogBytesPerHeapOop)); // initial to value
     __ mov(R12, copied); // count arg scratched by post barrier
 
-    code_gen->arraycopy_epilogue(this, decorators, true, to, R12, R3);
+    bs->arraycopy_epilogue(this, decorators, true, to, R12, R3);
 
     assert_different_registers(R3,R12,LR,copied,saved_count);
     inc_counter_np(SharedRuntime::_checkcast_array_copy_ctr, R3, R12);
 
     __ BIND(L_not_copied);