--- old/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.cpp	2019-03-26 15:44:56.717301491 +0000
+++ new/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.cpp	2019-03-26 15:44:54.217197443 +0000
@@ -229,3 +229,20 @@
   __ str(t1, Address(rthread, in_bytes(JavaThread::allocated_bytes_offset())));
 }
 
+void BarrierSetAssembler::nmethod_entry_barrier(MacroAssembler* masm)  {
+// DMS CHECK: 8210498: nmethod entry barriers, should we implement it?
+#if 0
+ BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod();
+  if (bs_nm == NULL) {
+    return;
+  }
+  Label continuation;
+  Address disarmed_addr(rthread, in_bytes(bs_nm->thread_disarmed_offset()));
+  __ align(8);
+  __ ldr(rscratch1, disarmed_addr);
+  __ cbz(rscratch1, continuation);
+  __ blr(RuntimeAddress(StubRoutines::aarch64::method_entry_barrier()));
+  __ bind(continuation);
+#endif
+}
+