--- old/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.cpp	2018-06-19 15:43:42.309044638 -0400
+++ new/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.cpp	2018-06-19 15:43:41.979070127 -0400
@@ -158,7 +158,7 @@
 }
 
 // Defines obj, preserves var_size_in_bytes
-void BarrierSetAssembler::eden_allocate(MacroAssembler* masm,Register thread, Register obj,
+void BarrierSetAssembler::eden_allocate(MacroAssembler* masm, Register obj,
                                         Register var_size_in_bytes,
                                         int con_size_in_bytes,
                                         Register t1,
@@ -210,25 +210,22 @@
     __ stlxr(rscratch2, end, rscratch1);
     __ cbnzw(rscratch2, retry);
 
-    incr_allocated_bytes(masm, thread, var_size_in_bytes, con_size_in_bytes, t1);
+    incr_allocated_bytes(masm, var_size_in_bytes, con_size_in_bytes, t1);
   }
 }
 
-void BarrierSetAssembler::incr_allocated_bytes(MacroAssembler* masm, Register thread,
+void BarrierSetAssembler::incr_allocated_bytes(MacroAssembler* masm,
                                                Register var_size_in_bytes,
                                                int con_size_in_bytes,
                                                Register t1) {
-  if (!thread->is_valid()) {
-    thread = rthread;
-  }
   assert(t1->is_valid(), "need temp reg");
 
-  __ ldr(t1, Address(thread, in_bytes(JavaThread::allocated_bytes_offset())));
+  __ ldr(t1, Address(rthread, in_bytes(JavaThread::allocated_bytes_offset())));
   if (var_size_in_bytes->is_valid()) {
     __ add(t1, t1, var_size_in_bytes);
   } else {
     __ add(t1, t1, con_size_in_bytes);
   }
-  __ str(t1, Address(thread, in_bytes(JavaThread::allocated_bytes_offset())));
+  __ str(t1, Address(rthread, in_bytes(JavaThread::allocated_bytes_offset())));
 }