# HG changeset patch
# Parent 597597e493ce11928a8122aa65260e9258d58527
diff -r 597597e493ce -r 4df08e8d1752 src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.cpp
--- a/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.cpp	Wed Apr 11 12:34:39 2018 -0400
+++ b/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.cpp	Wed Apr 11 13:07:38 2018 -0400
@@ -324,7 +324,8 @@
   // load of the previous value; otherwise it has already
   // been loaded into _pre_val.
 
-  __ bind(stub->_entry);
+  __ bind(*stub->entry());
+
   assert(stub->pre_val()->is_register(), "Precondition.");
 
   Register pre_val_reg = stub->pre_val()->as_register();
@@ -332,22 +333,22 @@
   if (stub->do_load()) {
     ce->mem2reg(stub->addr(), stub->pre_val(), T_OBJECT, stub->patch_code(), stub->info(), false /*wide*/, false /*unaligned*/);
   }
-  __ cbz(pre_val_reg, stub->_continuation);
+  __ cbz(pre_val_reg, *stub->continuation());
   ce->store_parameter(stub->pre_val()->as_register(), 0);
   __ far_call(RuntimeAddress(bs->pre_barrier_c1_runtime_code_blob()->code_begin()));
-  __ b(stub->_continuation);
+  __ b(*stub->continuation());
 }
 
 void G1BarrierSetAssembler::gen_g1_post_barrier_stub(LIR_Assembler* ce, G1PostBarrierStub* stub) {
   G1BarrierSetC1* bs = (G1BarrierSetC1*)Universe::heap()->barrier_set()->barrier_set_c1();
-  __ bind(stub->_entry);
+  __ bind(*stub->entry());
   assert(stub->addr()->is_register(), "Precondition.");
   assert(stub->new_val()->is_register(), "Precondition.");
   Register new_val_reg = stub->new_val()->as_register();
-  __ cbz(new_val_reg, stub->_continuation);
+  __ cbz(new_val_reg, *stub->continuation());
   ce->store_parameter(stub->addr()->as_pointer_register(), 0);
   __ far_call(RuntimeAddress(bs->post_barrier_c1_runtime_code_blob()->code_begin()));
-  __ b(stub->_continuation);
+  __ b(*stub->continuation());
 }
 
 #undef __
@@ -400,7 +401,7 @@
   __ bind(runtime);
   __ push_call_clobbered_registers();
   __ load_parameter(0, pre_val);
-  __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSet::g1_wb_pre), pre_val, thread);
+  __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::g1_wb_pre), pre_val, thread);
   __ pop_call_clobbered_registers();
   __ bind(done);
 
@@ -472,7 +473,7 @@
 
   __ bind(runtime);
   __ push_call_clobbered_registers();
-  __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSet::g1_wb_post), card_addr, thread);
+  __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::g1_wb_post), card_addr, thread);
   __ pop_call_clobbered_registers();
   __ bind(done);
   __ epilogue();