Move fields to ParseEnvironment to pass less arguments to translators

Author: eregon

src/main/java/org/truffleruby/parser/ParseEnvironment.java

@@ -9,6 +9,7 @@
  */
 package org.truffleruby.parser;
 
+import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.source.Source;
 import org.prism.Nodes;
 import org.truffleruby.RubyLanguage;
@@ -21,8 +22,12 @@
  * then multiple threads might lazy translate methods of the same file in parallel. */
 public final class ParseEnvironment {
 
+    public final RubyLanguage language;
+    public final RubySource rubySource;
     public final Source source;
     public final ParserContext parserContext;
+    public final Node currentNode;
+
     private final boolean inCore;
     private final boolean coverageEnabled;
 
@@ -31,9 +36,17 @@ public final class ParseEnvironment {
     // Set once after parsing and before translating
     public Boolean allowTruffleRubyPrimitives = null;
 
-    public ParseEnvironment(RubyLanguage language, RubySource rubySource, ParserContext parserContext) {
+    public ParseEnvironment(
+            RubyLanguage language,
+            RubySource rubySource,
+            ParserContext parserContext,
+            Node currentNode) {
+        this.language = language;
+        this.rubySource = rubySource;
         this.source = rubySource.getSource();
         this.parserContext = parserContext;
+        this.currentNode = currentNode;
+
         this.inCore = RubyLanguage.getPath(source).startsWith(language.corePath);
         this.coverageEnabled = RubyLanguage.MIME_TYPE_COVERAGE.equals(rubySource.getSource().getMimeType());
     }

src/main/java/org/truffleruby/parser/TranslatorDriver.java

@@ -104,7 +104,7 @@ public TranslatorDriver(RubyContext context) {
 
     public RootCallTarget parse(RubySource rubySource, ParserContext parserContext, String[] argumentNames,
             MaterializedFrame parentFrame, LexicalScope staticLexicalScope, Node currentNode) {
-        this.parseEnvironment = new ParseEnvironment(language, rubySource, parserContext);
+        this.parseEnvironment = new ParseEnvironment(language, rubySource, parserContext, currentNode);
 
         if (language.options.PRISM) {
             return new YARPTranslatorDriver(context).parse(rubySource, parserContext, argumentNames,

src/main/java/org/truffleruby/parser/YARPBaseTranslator.java

@@ -10,7 +10,9 @@
 package org.truffleruby.parser;
 
 import java.util.List;
+import java.util.Objects;
 
+import com.oracle.truffle.api.nodes.Node;
 import org.prism.AbstractNodeVisitor;
 import org.prism.Nodes;
 import org.truffleruby.RubyLanguage;
@@ -32,14 +34,15 @@
 
 public abstract class YARPBaseTranslator extends AbstractNodeVisitor<RubyNode> {
 
-    protected final RubyLanguage language;
     protected final TranslatorEnvironment environment;
-    protected final RubySource rubySource;
 
-    // For convenient/concise access, actually redundant with the rubySource field
+    // For convenient/concise access, actually redundant with environment.getParseEnvironment()
+    protected final ParseEnvironment parseEnvironment;
+    protected final RubyLanguage language;
+    protected final RubySource rubySource;
     protected final Source source;
-    protected final byte[] sourceBytes;
     protected final RubyEncoding sourceEncoding;
+    protected final Node currentNode;
 
     public static final Nodes.Node[] EMPTY_NODE_ARRAY = Nodes.Node.EMPTY_ARRAY;
 
@@ -48,16 +51,14 @@ public abstract class YARPBaseTranslator extends AbstractNodeVisitor<RubyNode> {
 
     public static final short NO_FLAGS = 0;
 
-    public YARPBaseTranslator(
-            RubyLanguage language,
-            TranslatorEnvironment environment,
-            RubySource rubySource) {
-        this.language = language;
-        this.environment = environment;
-        this.rubySource = rubySource;
+    public YARPBaseTranslator(TranslatorEnvironment environment) {
+        this.environment = Objects.requireNonNull(environment);
+        this.parseEnvironment = environment.getParseEnvironment();
+        this.language = parseEnvironment.language;
+        this.rubySource = parseEnvironment.rubySource;
         this.source = rubySource.getSource();
-        this.sourceBytes = rubySource.getBytes();
         this.sourceEncoding = rubySource.getEncoding();
+        this.currentNode = parseEnvironment.currentNode;
     }
 
     public final TranslatorEnvironment getEnvironment() {
@@ -131,8 +132,8 @@ protected static Nodes.CallNode callNode(Nodes.Node location, short flags, Nodes
     }
 
     protected final TruffleString toTString(Nodes.Node node) {
-        return TruffleString.fromByteArrayUncached(sourceBytes, node.startOffset, node.length, sourceEncoding.tencoding,
-                false);
+        return TruffleString.fromByteArrayUncached(rubySource.getBytes(), node.startOffset, node.length,
+                sourceEncoding.tencoding, false);
     }
 
     protected final TruffleString toTString(String string) {
@@ -188,9 +189,9 @@ protected final void copyNewlineFlag(Nodes.Node yarpNode, RubyNode rubyNode) {
         if (yarpNode.hasNewLineFlag()) {
             TruffleSafepoint.poll(DummyNode.INSTANCE);
 
-            if (environment.getParseEnvironment().isCoverageEnabled()) {
+            if (parseEnvironment.isCoverageEnabled()) {
                 rubyNode.unsafeSetIsCoverageLine();
-                int startLine = environment.getParseEnvironment().yarpSource.line(yarpNode.startOffset);
+                int startLine = parseEnvironment.yarpSource.line(yarpNode.startOffset);
                 language.coverageManager.setLineHasCode(source, startLine);
             }
 

src/main/java/org/truffleruby/parser/YARPBlockNodeTranslator.java

@@ -10,7 +10,6 @@
 package org.truffleruby.parser;
 
 import com.oracle.truffle.api.RootCallTarget;
-import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.NodeUtil;
 import com.oracle.truffle.api.source.SourceSection;
 import org.prism.Nodes;
@@ -46,14 +45,8 @@ public final class YARPBlockNodeTranslator extends YARPTranslator {
 
     private final Arity arity;
 
-    public YARPBlockNodeTranslator(
-            RubyLanguage language,
-            TranslatorEnvironment environment,
-            RubySource rubySource,
-            ParserContext parserContext,
-            Node currentNode,
-            Arity arity) {
-        super(language, environment, rubySource, parserContext, currentNode);
+    public YARPBlockNodeTranslator(TranslatorEnvironment environment, Arity arity) {
+        super(environment);
         this.arity = arity;
     }
 
@@ -63,9 +56,7 @@ public RubyNode compileBlockNode(Nodes.Node body, Nodes.ParametersNode parameter
         declareLocalVariables(locals);
 
         final RubyNode loadArguments = new YARPLoadArgumentsTranslator(
-                language,
                 environment,
-                rubySource,
                 parameters,
                 arity,
                 !isStabbyLambda,
@@ -164,9 +155,7 @@ private RubyNode preludeProc(
             final RubyNode readArrayNode = new ReadLocalVariableNode(LocalVariableType.FRAME_LOCAL, arraySlot);
 
             final var translator = new YARPParametersNodeToDestructureTranslator(
-                    language,
                     environment,
-                    rubySource,
                     parameters,
                     readArrayNode,
                     this);

src/main/java/org/truffleruby/parser/YARPDefNodeTranslator.java

@@ -18,7 +18,6 @@
 import org.truffleruby.language.methods.Arity;
 import org.truffleruby.language.methods.CachedLazyCallTargetSupplier;
 
-import com.oracle.truffle.api.nodes.Node;
 import org.prism.Nodes;
 
 public final class YARPDefNodeTranslator extends YARPTranslator {
@@ -27,13 +26,10 @@ public final class YARPDefNodeTranslator extends YARPTranslator {
 
     public YARPDefNodeTranslator(
             RubyLanguage language,
-            TranslatorEnvironment environment,
-            RubySource rubySource,
-            ParserContext parserContext,
-            Node currentNode) {
-        super(language, environment, rubySource, parserContext, currentNode);
+            TranslatorEnvironment environment) {
+        super(environment);
 
-        if (parserContext.isEval() || environment.getParseEnvironment().isCoverageEnabled()) {
+        if (parseEnvironment.parserContext.isEval() || parseEnvironment.isCoverageEnabled()) {
             shouldLazyTranslate = false;
         } else if (language.getSourcePath(source).startsWith(language.coreLoadPath)) {
             shouldLazyTranslate = language.options.LAZY_TRANSLATION_CORE;
@@ -46,9 +42,7 @@ private RubyNode compileMethodBody(Nodes.DefNode node, Nodes.ParametersNode para
         declareLocalVariables(node);
 
         final RubyNode loadArguments = new YARPLoadArgumentsTranslator(
-                language,
                 environment,
-                rubySource,
                 parameters,
                 arity,
                 false,

src/main/java/org/truffleruby/parser/YARPLoadArgumentsTranslator.java

@@ -15,7 +15,6 @@
 
 import com.oracle.truffle.api.CompilerDirectives;
 import org.truffleruby.Layouts;
-import org.truffleruby.RubyLanguage;
 import org.truffleruby.language.RubyNode;
 import org.truffleruby.language.arguments.CheckNoKeywordArgumentsNode;
 import org.truffleruby.language.arguments.MissingArgumentBehavior;
@@ -56,15 +55,13 @@ private enum State {
     private int repeatedParameterCounter = 2;
 
     public YARPLoadArgumentsTranslator(
-            RubyLanguage language,
             TranslatorEnvironment environment,
-            RubySource rubySource,
             Nodes.ParametersNode parameters,
             Arity arity,
             boolean isProc,
             boolean isMethod,
             YARPTranslator yarpTranslator) {
-        super(language, environment, rubySource);
+        super(environment);
         this.arity = arity;
         this.isProc = isProc;
         this.isMethod = isMethod;

src/main/java/org/truffleruby/parser/YARPParametersNodeToDestructureTranslator.java

@@ -14,7 +14,6 @@
 
 import com.oracle.truffle.api.CompilerDirectives;
 import org.prism.Nodes;
-import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.array.ArrayIndexNodes;
 import org.truffleruby.core.array.ArraySliceNodeGen;
 import org.truffleruby.core.hash.HashLiteralNode;
@@ -56,13 +55,11 @@ private enum State {
     private final RubyNode readArrayNode;
 
     public YARPParametersNodeToDestructureTranslator(
-            RubyLanguage language,
             TranslatorEnvironment environment,
-            RubySource rubySource,
             Nodes.ParametersNode parameters,
             RubyNode readArrayNode,
             YARPTranslator yarpTranslator) {
-        super(language, environment, rubySource);
+        super(environment);
         this.parameters = parameters;
         this.readArrayNode = readArrayNode;
         this.yarpTranslator = yarpTranslator;

src/main/java/org/truffleruby/parser/YARPPatternMatchingTranslator.java

@@ -12,7 +12,6 @@
 import java.util.Arrays;
 
 import org.prism.Nodes;
-import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.array.ArrayDeconstructNodeGen;
 import org.truffleruby.core.array.ArrayIndexNodes;
 import org.truffleruby.core.array.ArrayPatternLengthCheckNodeGen;
@@ -44,11 +43,9 @@ public final class YARPPatternMatchingTranslator extends YARPBaseTranslator {
     private RubyNode currentValueToMatch;
 
     public YARPPatternMatchingTranslator(
-            RubyLanguage language,
             TranslatorEnvironment environment,
-            RubySource rubySource,
             YARPTranslator yarpTranslator) {
-        super(language, environment, rubySource);
+        super(environment);
         this.yarpTranslator = yarpTranslator;
     }
 

src/main/java/org/truffleruby/parser/YARPReloadArgumentsTranslator.java

@@ -16,7 +16,6 @@
 import com.oracle.truffle.api.CompilerDirectives;
 import org.prism.Nodes;
 import org.truffleruby.Layouts;
-import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.hash.ConcatHashLiteralNode;
 import org.truffleruby.core.hash.HashLiteralNode;
 import org.truffleruby.language.RubyNode;
@@ -41,12 +40,10 @@ public final class YARPReloadArgumentsTranslator extends YARPBaseTranslator {
     private int repeatedParameterCounter = 2;
 
     public YARPReloadArgumentsTranslator(
-            RubyLanguage language,
             TranslatorEnvironment environment,
-            RubySource rubySource,
             YARPTranslator yarpTranslator,
             Nodes.ParametersNode parametersNode) {
-        super(language, environment, rubySource);
+        super(environment);
         this.yarpTranslator = yarpTranslator;
         this.hasKeywordArguments = parametersNode.keywords.length > 0 || parametersNode.keyword_rest != null;
     }