Fixup after rebase.

Author: aardvark179

src/main/java/org/truffleruby/cext/CExtNodes.java

@@ -703,9 +703,8 @@ protected Object block() {
     public abstract static class VarsFromStackNode extends PrimitiveArrayArgumentsNode {
 
         @Specialization
-        protected Object variables(
-                @Cached MarkingServiceNodes.GetMarkerThreadLocalDataNode getDataNode) {
-            return getDataNode.execute().getExtensionCallStack().getVariables();
+        protected Object variables() {
+            return getLanguage().getCurrentThread().getCurrentFiber().extensionCallStack.getVariables();
         }
     }
 

src/main/java/org/truffleruby/core/fiber/RubyFiber.java

@@ -65,7 +65,7 @@ public RubyFiber(
         this.catchTags = ArrayHelpers.createEmptyArray(context, language);
         this.rubyThread = rubyThread;
         this.sourceLocation = sourceLocation;
-        extensionCallStack = new MarkingService.ExtensionCallStack(Nil.INSTANCE);
+        extensionCallStack = new MarkingService.ExtensionCallStack(null, Nil.INSTANCE);
         handleData = new ValueWrapperManager.HandleBlockHolder();
     }
 

src/main/java/org/truffleruby/core/thread/TruffleThreadNodes.java

@@ -16,7 +16,6 @@
 import org.truffleruby.core.array.RubyArray;
 import org.truffleruby.core.array.library.ArrayStoreLibrary;
 import org.truffleruby.core.kernel.TruffleKernelNodes.GetSpecialVariableStorage;
-import org.truffleruby.core.MarkingServiceNodes;
 import org.truffleruby.language.arguments.CallerDataReadingNode;
 import org.truffleruby.language.FrameAndVariablesSendingNode;
 
@@ -52,8 +51,7 @@ public abstract static class FindRubyCallerSpecialStorage extends CoreMethodArra
         @Specialization(limit = "storageStrategyLimit()")
         protected Object findRubyCaller(RubyArray modules,
                 @CachedLibrary("modules.store") ArrayStoreLibrary stores,
-                @Cached GetSpecialVariableStorage storageNode,
-                @Cached MarkingServiceNodes.GetMarkerThreadLocalDataNode getDataNode) {
+                @Cached GetSpecialVariableStorage storageNode) {
             final int modulesSize = modules.size;
             Object[] moduleArray = stores.boxedCopyOfRange(modules.store, 0, modulesSize);
             FrameAndCallNode data = getContext()
@@ -66,7 +64,7 @@ protected Object findRubyCaller(RubyArray modules,
             } else {
                 CallerDataReadingNode.notifyCallerToSendData(getContext(), data.callNode, this);
                 Object variables = storageNode.execute(data.frame.materialize());
-                getDataNode.execute().getExtensionCallStack().setVariables(variables);
+                getLanguage().getCurrentThread().getCurrentFiber().extensionCallStack.setVariables(variables);
                 return variables;
             }
         }