diff --git a/src/hotspot/cpu/arm/stubGenerator_arm.cpp b/src/hotspot/cpu/arm/stubGenerator_arm.cpp
index cabbb98..b364013 100644
--- a/src/hotspot/cpu/arm/stubGenerator_arm.cpp
+++ b/src/hotspot/cpu/arm/stubGenerator_arm.cpp
@@ -26,7 +26,7 @@
 #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"
@@ -2876,9 +2876,8 @@ class StubGenerator: public StubCodeGenerator {
 
     // '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
@@ -2954,9 +2953,8 @@ class StubGenerator: public StubCodeGenerator {
       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);
@@ -3221,9 +3219,8 @@ class StubGenerator: public StubCodeGenerator {
 
     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;
@@ -3301,7 +3298,7 @@ class StubGenerator: public StubCodeGenerator {
     __ 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);