--- old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotReplacementsUtil.java	2018-04-11 14:33:20.197169934 -0700
+++ new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotReplacementsUtil.java	2018-04-11 14:33:19.869171055 -0700
@@ -178,11 +178,11 @@
         return config.threadTlabTopOffset();
     }
 
-    public static final LocationIdentity TLAB_END_LOCATION = NamedLocationIdentity.mutable("TlabEnd");
+    public static final LocationIdentity TLAB_FAST_PATH_END_LOCATION = NamedLocationIdentity.mutable("TlabFastPathEnd");
 
     @Fold
-    static int threadTlabEndOffset(@InjectedParameter GraalHotSpotVMConfig config) {
-        return config.threadTlabEndOffset();
+    static int threadTlabFastPathEndOffset(@InjectedParameter GraalHotSpotVMConfig config) {
+        return config.threadTlabFastPathEndOffset();
     }
 
     public static final LocationIdentity TLAB_START_LOCATION = NamedLocationIdentity.mutable("TlabStart");
@@ -245,8 +245,8 @@
         return thread.readWord(threadTlabTopOffset(INJECTED_VMCONFIG), TLAB_TOP_LOCATION);
     }
 
-    public static Word readTlabEnd(Word thread) {
-        return thread.readWord(threadTlabEndOffset(INJECTED_VMCONFIG), TLAB_END_LOCATION);
+    public static Word readTlabFastPathEnd(Word thread) {
+        return thread.readWord(threadTlabFastPathEndOffset(INJECTED_VMCONFIG), TLAB_FAST_PATH_END_LOCATION);
     }
 
     public static Word readTlabStart(Word thread) {
@@ -261,7 +261,7 @@
     public static void initializeTlab(Word thread, Word start, Word end) {
         thread.writeWord(threadTlabStartOffset(INJECTED_VMCONFIG), start, TLAB_START_LOCATION);
         thread.writeWord(threadTlabTopOffset(INJECTED_VMCONFIG), start, TLAB_TOP_LOCATION);
-        thread.writeWord(threadTlabEndOffset(INJECTED_VMCONFIG), end, TLAB_END_LOCATION);
+        thread.writeWord(threadTlabFastPathEndOffset(INJECTED_VMCONFIG), end, TLAB_FAST_PATH_END_LOCATION);
     }
 
     /**