No need to store RubyContext in FormatRootNode

Author: eregon

src/main/java/org/truffleruby/core/format/FormatRootNode.java

@@ -11,7 +11,7 @@
 
 import java.util.List;
 
-import org.truffleruby.RubyContext;
+import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.rope.CodeRange;
 import org.truffleruby.extra.ffi.Pointer;
 import org.truffleruby.language.RubyBaseRootNode;
@@ -27,16 +27,20 @@
 /** The node at the root of a pack expression. */
 public class FormatRootNode extends RubyBaseRootNode implements InternalRootNode {
 
-    private final RubyContext context;
+    private final RubyLanguage language;
     private final FormatEncoding encoding;
 
     @Child private FormatNode child;
 
     @CompilationFinal private int expectedLength = 0;
 
-    public FormatRootNode(RubyContext context, SourceSection sourceSection, FormatEncoding encoding, FormatNode child) {
-        super(context.getLanguageSlow(), FormatFrameDescriptor.FRAME_DESCRIPTOR, sourceSection);
-        this.context = context;
+    public FormatRootNode(
+            RubyLanguage language,
+            SourceSection sourceSection,
+            FormatEncoding encoding,
+            FormatNode child) {
+        super(language, FormatFrameDescriptor.FRAME_DESCRIPTOR, sourceSection);
+        this.language = language;
         this.encoding = encoding;
         this.child = child;
     }
@@ -139,8 +143,4 @@ public String getName() {
     public String toString() {
         return getName();
     }
-
-    public RubyContext getContext() {
-        return context;
-    }
 }

src/main/java/org/truffleruby/core/format/pack/PackCompiler.java

@@ -44,7 +44,7 @@ public RootCallTarget compile(String format) {
 
         return Truffle.getRuntime().createCallTarget(
                 new FormatRootNode(
-                        context,
+                        context.getLanguageSlow(),
                         currentNode.getEncapsulatingSourceSection(),
                         builder.getEncoding(),
                         builder.getNode()));

src/main/java/org/truffleruby/core/format/printf/PrintfCompiler.java

@@ -12,7 +12,7 @@
 import java.util.List;
 
 import com.oracle.truffle.api.nodes.Node;
-import org.truffleruby.RubyContext;
+import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.format.FormatEncoding;
 import org.truffleruby.core.format.FormatRootNode;
 import org.truffleruby.core.rope.Rope;
@@ -22,22 +22,22 @@
 
 public class PrintfCompiler {
 
-    private final RubyContext context;
+    private final RubyLanguage language;
     private final Node currentNode;
 
-    public PrintfCompiler(RubyContext context, Node currentNode) {
-        this.context = context;
+    public PrintfCompiler(RubyLanguage language, Node currentNode) {
+        this.language = language;
         this.currentNode = currentNode;
     }
 
     public RootCallTarget compile(Rope format, Object[] arguments, boolean isDebug) {
         final PrintfSimpleParser parser = new PrintfSimpleParser(bytesToChars(format.getBytes()), arguments, isDebug);
         final List<SprintfConfig> configs = parser.parse();
-        final PrintfSimpleTreeBuilder builder = new PrintfSimpleTreeBuilder(context, configs);
+        final PrintfSimpleTreeBuilder builder = new PrintfSimpleTreeBuilder(language, configs);
 
         return Truffle.getRuntime().createCallTarget(
                 new FormatRootNode(
-                        context,
+                        language,
                         currentNode.getEncapsulatingSourceSection(),
                         FormatEncoding.find(format.getEncoding()),
                         builder.getNode()));

src/main/java/org/truffleruby/core/format/printf/PrintfSimpleTreeBuilder.java

@@ -14,7 +14,7 @@
 
 import com.oracle.truffle.api.CompilerDirectives;
 import org.jcodings.specific.USASCIIEncoding;
-import org.truffleruby.RubyContext;
+import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.format.FormatNode;
 import org.truffleruby.core.format.LiteralFormatNode;
 import org.truffleruby.core.format.SharedTreeBuilder;
@@ -40,16 +40,16 @@
 
 public class PrintfSimpleTreeBuilder {
 
-    private final RubyContext context;
+    private final RubyLanguage language;
     private final List<FormatNode> sequence = new ArrayList<>();
     private final List<SprintfConfig> configs;
 
     public static final int DEFAULT = -1;
 
     private static final byte[] EMPTY_BYTES = RopeConstants.EMPTY_BYTES;
 
-    public PrintfSimpleTreeBuilder(RubyContext context, List<SprintfConfig> configs) {
-        this.context = context;
+    public PrintfSimpleTreeBuilder(RubyLanguage language, List<SprintfConfig> configs) {
+        this.language = language;
         this.configs = configs;
     }
 
@@ -62,7 +62,7 @@ private void buildTree() {
                 final FormatNode valueNode;
 
                 if (config.getNamesBytes() != null) {
-                    final RubySymbol key = context.getLanguageSlow().getSymbol(RopeOperations.create(
+                    final RubySymbol key = language.getSymbol(RopeOperations.create(
                             config.getNamesBytes(),
                             USASCIIEncoding.INSTANCE,
                             CodeRange.CR_7BIT));

src/main/java/org/truffleruby/core/kernel/KernelNodes.java

@@ -1838,7 +1838,7 @@ private RubyString finishFormat(int formatLength, BytesResult result) {
         protected RootCallTarget compileFormat(Object format, Object[] arguments, boolean isDebug,
                 RubyStringLibrary libFormat) {
             try {
-                return new PrintfCompiler(getContext(), this)
+                return new PrintfCompiler(getLanguage(), this)
                         .compile(libFormat.getRope(format), arguments, isDebug);
             } catch (InvalidFormatException e) {
                 throw new RaiseException(getContext(), coreExceptions().argumentError(e.getMessage(), this));