--- old/src/hotspot/cpu/x86/macroAssembler_x86.cpp	2018-02-12 20:05:02.419776622 -0800
+++ new/src/hotspot/cpu/x86/macroAssembler_x86.cpp	2018-02-12 20:05:02.175777562 -0800
@@ -5585,7 +5585,7 @@
   } else {
     lea(end, Address(obj, var_size_in_bytes, Address::times_1));
   }
-  cmpptr(end, Address(thread, JavaThread::tlab_end_offset()));
+  cmpptr(end, Address(thread, JavaThread::tlab_current_end_offset()));
   jcc(Assembler::above, slow_case);
 
   // update the tlab top pointer
@@ -5617,7 +5617,7 @@
   NOT_LP64(get_thread(thread_reg));
 
   movptr(top, Address(thread_reg, in_bytes(JavaThread::tlab_top_offset())));
-  movptr(t1,  Address(thread_reg, in_bytes(JavaThread::tlab_end_offset())));
+  movptr(t1,  Address(thread_reg, in_bytes(JavaThread::tlab_current_end_offset())));
 
   // calculate amount of free space
   subptr(t1, top);
@@ -5698,7 +5698,7 @@
   movptr(Address(thread_reg, in_bytes(JavaThread::tlab_top_offset())), top);
   addptr(top, t1);
   subptr(top, (int32_t)ThreadLocalAllocBuffer::alignment_reserve_in_bytes());
-  movptr(Address(thread_reg, in_bytes(JavaThread::tlab_end_offset())), top);
+  movptr(Address(thread_reg, in_bytes(JavaThread::tlab_current_end_offset())), top);
 
   if (ZeroTLAB) {
     // This is a fast TLAB refill, therefore the GC is not notified of it.
@@ -6259,7 +6259,7 @@
     should_not_reach_here();
 
     bind(next);
-    movptr(t1, Address(thread_reg, in_bytes(JavaThread::tlab_end_offset())));
+    movptr(t1, Address(thread_reg, in_bytes(JavaThread::tlab_current_end_offset())));
     cmpptr(t1, Address(thread_reg, in_bytes(JavaThread::tlab_top_offset())));
     jcc(Assembler::aboveEqual, ok);
     STOP("assert(top <= end)");