src/hotspot/cpu/x86/stubGenerator_x86_32.cpp

rename things

 
 #include "precompiled.hpp"
 #include "asm/macroAssembler.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_x86.hpp"
 #include "oops/instanceOop.hpp"
 #include "oops/method.hpp"
 #include "oops/objArrayKlass.hpp"

@@ -843,11 +843,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, from, to, count);
 
     __ subptr(to, from); // to --> to_from
     __ cmpl(count, 2<<shift); // Short arrays (< 8 bytes) copy by element
     __ jcc(Assembler::below, L_copy_4_bytes); // use unsigned cmp

@@ -1032,11 +1032,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, from, to, count);
 
     // copy from high to low
     __ cmpl(count, 2<<shift); // Short arrays (< 8 bytes) copy by element
     __ jcc(Assembler::below, L_copy_4_bytes); // use unsigned cmp

@@ -1387,11 +1387,11
     if (dest_uninitialized) {
       decorators |= AS_DEST_NOT_INITIALIZED;
     }
 
     BasicType type = T_OBJECT;
-    BarrierSetCodeGen *bs = Universe::heap()->barrier_set()->code_gen();
+    BarrierSetAssembler *bs = Universe::heap()->barrier_set()->barrier_set_assembler();
     bs->arraycopy_prologue(_masm, decorators, type, from, to, count);
 
     // Copy from low to high addresses, indexed from the end of each array.
     __ lea(end_from, end_from_addr);
     __ lea(end_to,   end_to_addr);