Move logic in the RubyFiber constructor and call it directly

Author: eregon

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

@@ -16,13 +16,9 @@
 import org.truffleruby.RubyContext;
 import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.DummyNode;
-import org.truffleruby.core.array.ArrayHelpers;
-import org.truffleruby.core.array.RubyArray;
 import org.truffleruby.core.basicobject.BasicObjectNodes.ObjectIDNode;
-import org.truffleruby.core.basicobject.RubyBasicObject;
 import org.truffleruby.core.exception.ExceptionOperations;
 import org.truffleruby.core.exception.RubyException;
-import org.truffleruby.core.klass.RubyClass;
 import org.truffleruby.core.proc.ProcOperations;
 import org.truffleruby.core.thread.RubyThread;
 import org.truffleruby.core.proc.RubyProc;
@@ -35,11 +31,9 @@
 import org.truffleruby.language.control.RaiseException;
 import org.truffleruby.language.control.TerminationException;
 
-import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.nodes.Node;
-import com.oracle.truffle.api.object.Shape;
 import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.source.SourceSection;
 import org.truffleruby.language.objects.shared.SharedObjects;
@@ -57,27 +51,6 @@ public FiberManager(RubyLanguage language, RubyContext context) {
         this.context = context;
     }
 
-    public static RubyFiber createRootFiber(RubyLanguage language, RubyContext context, RubyThread thread) {
-        return createFiber(
-                language,
-                context,
-                thread,
-                context.getCoreLibrary().fiberClass,
-                language.fiberShape,
-                "root");
-    }
-
-    public static RubyFiber createFiber(RubyLanguage language, RubyContext context, RubyThread thread,
-            RubyClass rubyClass, Shape shape, String sourceLocation) {
-        CompilerAsserts.partialEvaluationConstant(language);
-        final RubyBasicObject fiberLocals = new RubyBasicObject(
-                context.getCoreLibrary().objectClass,
-                language.basicObjectShape);
-        final RubyArray catchTags = ArrayHelpers.createEmptyArray(context, language);
-
-        return new RubyFiber(rubyClass, shape, fiberLocals, catchTags, thread, sourceLocation);
-    }
-
     public void initialize(RubyFiber fiber, RubyProc block, Node currentNode) {
         final SourceSection sourceSection = block.sharedMethodInfo.getSourceSection();
         fiber.sourceLocation = RubyLanguage.fileLine(sourceSection);

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

@@ -94,12 +94,12 @@ protected RubyFiber allocate(RubyClass rubyClass) {
             }
 
             final RubyThread thread = getLanguage().getCurrentThread();
-            final RubyFiber fiber = FiberManager.createFiber(
-                    getLanguage(),
-                    getContext(),
-                    thread,
+            final RubyFiber fiber = new RubyFiber(
                     rubyClass,
                     getLanguage().fiberShape,
+                    getContext(),
+                    getLanguage(),
+                    thread,
                     "<uninitialized>");
             AllocationTracing.trace(fiber, this);
             return fiber;

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

@@ -14,6 +14,10 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.LinkedBlockingQueue;
 
+import com.oracle.truffle.api.CompilerAsserts;
+import org.truffleruby.RubyContext;
+import org.truffleruby.RubyLanguage;
+import org.truffleruby.core.array.ArrayHelpers;
 import org.truffleruby.core.array.RubyArray;
 import org.truffleruby.core.basicobject.RubyBasicObject;
 import org.truffleruby.core.klass.RubyClass;
@@ -43,14 +47,17 @@ public final class RubyFiber extends RubyDynamicObject implements ObjectGraphNod
     public RubyFiber(
             RubyClass rubyClass,
             Shape shape,
-            RubyBasicObject fiberLocals,
-            RubyArray catchTags,
+            RubyContext context,
+            RubyLanguage language,
             RubyThread rubyThread,
             String sourceLocation) {
         super(rubyClass, shape);
         assert rubyThread != null;
-        this.fiberLocals = fiberLocals;
-        this.catchTags = catchTags;
+        CompilerAsserts.partialEvaluationConstant(language);
+        this.fiberLocals = new RubyBasicObject(
+                context.getCoreLibrary().objectClass,
+                language.basicObjectShape);
+        this.catchTags = ArrayHelpers.createEmptyArray(context, language);
         this.rubyThread = rubyThread;
         this.sourceLocation = sourceLocation;
     }

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

@@ -23,7 +23,6 @@
 import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.InterruptMode;
 import org.truffleruby.core.exception.RubyException;
-import org.truffleruby.core.fiber.FiberManager;
 import org.truffleruby.core.fiber.RubyFiber;
 import org.truffleruby.core.hash.HashOperations;
 import org.truffleruby.core.hash.RubyHash;
@@ -90,7 +89,13 @@ public RubyThread(
 
         // Initialized last as it captures `this`
         MemoryFence.storeStore();
-        this.rootFiber = FiberManager.createRootFiber(language, context, this);
+        this.rootFiber = new RubyFiber(
+                context.getCoreLibrary().fiberClass,
+                language.fiberShape,
+                context,
+                language,
+                this,
+                "root");
         this.currentFiber = rootFiber;
     }