src/hotspot/cpu/ppc/stubGenerator_ppc.cpp

rename things

  */
 
 #include "precompiled.hpp"
 #include "asm/macroAssembler.inline.hpp"
 #include "gc/shared/barrierSet.hpp"
-#include "gc/shared/barrierSetCodeGen.hpp"
+#include "gc/shared/barrierSetAssembler.hpp"
 #include "interpreter/interpreter.hpp"
 #include "nativeInst_ppc.hpp"
 #include "oops/instanceOop.hpp"
 #include "oops/method.hpp"
 #include "oops/objArrayKlass.hpp"

@@ -2030,11 +2030,11
     }
     if (aligned) {
       decorators |= ARRAYCOPY_ALIGNED;
     }
 
-    BarrierSetCodeGen *bs = Universe::heap()->barrier_set()->code_gen();
+    BarrierSetAssembler *bs = Universe::heap()->barrier_set()->barrier_set_assembler();
     bs->arraycopy_prologue(_masm, decorators, T_OBJECT, R3_ARG1, R4_ARG2, R5_ARG3, noreg, noreg);
 
     if (UseCompressedOops) {
       array_overlap_test(nooverlap_target, 2);
       generate_conjoint_int_copy_core(aligned);

@@ -2069,11 +2069,11
     }
     if (aligned) {
       decorators |= ARRAYCOPY_ALIGNED;
     }
 
-    BarrierSetCodeGen *bs = Universe::heap()->barrier_set()->code_gen();
+    BarrierSetAssembler *bs = Universe::heap()->barrier_set()->barrier_set_assembler();
     bs->arraycopy_prologue(_masm, decorators, T_OBJECT, R3_ARG1, R4_ARG2, R5_ARG3, noreg, noreg);
 
     if (UseCompressedOops) {
       generate_disjoint_int_copy_core(aligned);
     } else {

@@ -2162,11 +2162,11
     DecoratorSet decorators = ARRAYCOPY_CHECKCAST;
     if (dest_uninitialized) {
       decorators |= AS_DEST_NOT_INITIALIZED;
     }
 
-    BarrierSetCodeGen *bs = Universe::heap()->barrier_set()->code_gen();
+    BarrierSetAssembler *bs = Universe::heap()->barrier_set()->barrier_set_assembler();
     bs->arraycopy_prologue(_masm, decorators, T_OBJECT, R3_from, R4_to, R5_count, /* preserve: */ R6_ckoff, R7_ckval);
 
     //inc_counter_np(SharedRuntime::_checkcast_array_copy_ctr, R12_tmp, R3_RET);
 
     Label load_element, store_element, store_null, success, do_epilogue;