src/hotspot/cpu/sparc/stubGenerator_sparc.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_sparc.hpp"
 #include "oops/instanceOop.hpp"
 #include "oops/method.hpp"
 #include "oops/objArrayKlass.hpp"

@@ -2275,11 +2275,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, from, to, count);
 
     assert_clean_int(count, O3);     // Make sure 'count' is clean int.
     if (UseCompressedOops) {
       generate_disjoint_int_copy_core(aligned);

@@ -2332,11 +2332,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, from, to, count);
 
     if (UseCompressedOops) {
       generate_conjoint_int_copy_core(aligned);
     } else {

@@ -2449,11 +2449,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, O0_from, O1_to, O2_count);
 
     Label load_element, store_element, do_epilogue, fail, done;
     __ addcc(O2_count, 0, G1_remain);   // initialize loop index, and test it
     __ brx(Assembler::notZero, false, Assembler::pt, load_element);