Move to an empty frame descriptor on RubyLanguage.

Author: aardvark179

src/main/java/org/truffleruby/RubyLanguage.java

@@ -100,6 +100,7 @@
 import org.truffleruby.interop.RubyInnerContext;
 import org.truffleruby.interop.RubySourceLocation;
 import org.truffleruby.language.LexicalScope;
+import org.truffleruby.language.Nil;
 import org.truffleruby.language.RubyDynamicObject;
 import org.truffleruby.language.RubyEvalInteractiveRootNode;
 import org.truffleruby.language.RubyInlineParsingRequestNode;
@@ -181,6 +182,11 @@ public final class RubyLanguage extends TruffleLanguage<RubyContext> {
 
     public static final TruffleLogger LOGGER = TruffleLogger.getLogger(TruffleRuby.LANGUAGE_ID);
 
+    /** This is a truly empty frame descriptor and should only by dummy root nodes which require no variables any other
+     * root nodes should should use {#link
+     * {@link TranslatorEnvironment#newFrameDescriptorBuilder(org.truffleruby.parser.ParentFrameDescriptor, boolean)}}. */
+    public static final FrameDescriptor EMPTY_FRAME_DESCRIPTOR = new FrameDescriptor(Nil.INSTANCE);
+
     /** We need an extra indirection added to ContextThreadLocal due to multiple Fibers of different Ruby Threads
      * sharing the same Java Thread when using the fiber pool. */
     public static final class ThreadLocalState {

src/main/java/org/truffleruby/core/CoreLibrary.java

@@ -78,7 +78,6 @@
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleOptions;
-import com.oracle.truffle.api.frame.FrameDescriptor;
 import com.oracle.truffle.api.object.DynamicObjectLibrary;
 import com.oracle.truffle.api.source.Source;
 import com.oracle.truffle.api.source.SourceSection;
@@ -234,8 +233,6 @@ public class CoreLibrary {
     public final GlobalVariables globalVariables;
     public final BindingLocalVariablesObject interactiveBindingLocalVariablesObject;
 
-    public final FrameDescriptor emptyDescriptor;
-
     @CompilationFinal private RubyClass eagainWaitReadable;
     @CompilationFinal private RubyClass eagainWaitWritable;
 
@@ -552,7 +549,6 @@ public CoreLibrary(RubyContext context, RubyLanguage language) {
         // Create some key objects
 
         mainObject = new RubyBasicObject(objectClass, language.basicObjectShape);
-        emptyDescriptor = new FrameDescriptor(Nil.INSTANCE);
         argv = new RubyArray(arrayClass, language.arrayShape, ArrayStoreLibrary.INITIAL_STORE, 0);
 
         globalVariables = new GlobalVariables(context);

src/main/java/org/truffleruby/core/DataObjectFinalizationService.java

@@ -18,12 +18,10 @@
 import org.truffleruby.language.RubyBaseRootNode;
 import org.truffleruby.language.backtrace.InternalRootNode;
 
-import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.interop.ArityException;
 import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
 import com.oracle.truffle.api.interop.UnsupportedTypeException;
-import com.oracle.truffle.api.frame.FrameDescriptor;
 import com.oracle.truffle.api.frame.VirtualFrame;
 
 /** Finalizers are implemented with phantom references and reference queues, and are run in a dedicated Ruby thread. */
@@ -32,17 +30,16 @@ public class DataObjectFinalizationService extends ReferenceProcessingService<Da
     // We need a base node here, it shoudl extend ruby base root node and implement internal root node.
     public static class DataObjectFinalizerRootNode extends RubyBaseRootNode implements InternalRootNode {
 
-        private static final FrameDescriptor FINALIZER_FRAME = FrameDescriptor.newBuilder().build();
-
         @Child private InteropLibrary nullNode;
         @Child private InteropLibrary callNode;
 
         public DataObjectFinalizerRootNode(
-                TruffleLanguage<?> language) {
-            super(language, FINALIZER_FRAME, null);
+                RubyLanguage language) {
+            super(language, RubyLanguage.EMPTY_FRAME_DESCRIPTOR, null);
 
-            nullNode = insert(InteropLibrary.getFactory().createDispatched(2));
-            callNode = insert(InteropLibrary.getFactory().createDispatched(2));
+            nullNode = InteropLibrary.getFactory().createDispatched(2);
+            callNode = InteropLibrary.getFactory().createDispatched(2);
+            adoptChildren();
         }
 
         @Override

src/main/java/org/truffleruby/debug/MetricsInternalRootNode.java

@@ -10,6 +10,7 @@
 package org.truffleruby.debug;
 
 import org.truffleruby.RubyContext;
+import org.truffleruby.RubyLanguage;
 import org.truffleruby.language.RubyBaseRootNode;
 import org.truffleruby.language.RubyNode;
 import org.truffleruby.language.backtrace.InternalRootNode;
@@ -31,7 +32,7 @@ class MetricsInternalRootNode extends RubyBaseRootNode implements InternalRootNo
     @Child private RubyNode body;
 
     public MetricsInternalRootNode(RubyContext context, String name, RubyNode body) {
-        super(context.getLanguageSlow(), context.getCoreLibrary().emptyDescriptor, REQUIRE_METRICS_SOURCE_SECTION);
+        super(context.getLanguageSlow(), RubyLanguage.EMPTY_FRAME_DESCRIPTOR, REQUIRE_METRICS_SOURCE_SECTION);
         assert body != null;
 
         this.name = name;