--- old/src/hotspot/cpu/arm/macroAssembler_arm.cpp	2018-02-12 20:04:55.415803597 -0800
+++ new/src/hotspot/cpu/arm/macroAssembler_arm.cpp	2018-02-12 20:04:55.167804552 -0800
@@ -1309,7 +1309,7 @@
   assert_different_registers(obj, obj_end, tlab_end);
 
   ldr(obj, Address(Rthread, JavaThread::tlab_top_offset()));
-  ldr(tlab_end, Address(Rthread, JavaThread::tlab_end_offset()));
+  ldr(tlab_end, Address(Rthread, JavaThread::tlab_current_end_offset()));
   add_rc(obj_end, obj, size_expression);
   cmp(obj_end, tlab_end);
   b(slow_case, hi);
@@ -1327,7 +1327,7 @@
   InlinedAddress intArrayKlass_addr((address)Universe::intArrayKlassObj_addr());
   Label discard_tlab, do_refill;
   ldr(top,  Address(Rthread, JavaThread::tlab_top_offset()));
-  ldr(tmp1, Address(Rthread, JavaThread::tlab_end_offset()));
+  ldr(tmp1, Address(Rthread, JavaThread::tlab_current_end_offset()));
   ldr(tmp2, Address(Rthread, JavaThread::tlab_refill_waste_limit_offset()));
 
   // Calculate amount of free space
@@ -1397,7 +1397,7 @@
 #endif
 
   sub(tmp1, tmp1, ThreadLocalAllocBuffer::alignment_reserve_in_bytes());
-  str(tmp1, Address(Rthread, JavaThread::tlab_end_offset()));
+  str(tmp1, Address(Rthread, JavaThread::tlab_current_end_offset()));
 
   if (ZeroTLAB) {
     // clobbers start and tmp