Simplify to a single constructor for TranslatorEnvironment

Author: eregon

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

@@ -944,8 +944,9 @@ private RubyNode openModule(SourceIndexLength sourceSection, RubyNode defineOrGe
                 returnId = environment.getParseEnvironment().allocateReturnID();
             }
 
-            final TranslatorEnvironment newEnvironment = new TranslatorEnvironment(context, environment, environment.getParseEnvironment(),
-                            returnId, true, true, true, sharedMethodInfo, name, 0, null);
+            final TranslatorEnvironment newEnvironment = new TranslatorEnvironment(environment, environment.getParseEnvironment(),
+                    returnId, true, true, true,
+                    sharedMethodInfo, name, 0, null, TranslatorEnvironment.newFrameDescriptor(context));
 
             final BodyTranslator moduleTranslator = new BodyTranslator(currentNode, context, this, newEnvironment, source, parserContext, false);
 
@@ -1304,7 +1305,9 @@ protected RubyNode translateMethodDefinition(SourceIndexLength sourceSection, Ru
                 alwaysClone);
 
         final TranslatorEnvironment newEnvironment = new TranslatorEnvironment(
-                        context, environment, environment.getParseEnvironment(), environment.getParseEnvironment().allocateReturnID(), true, true, false, sharedMethodInfo, methodName, 0, null);
+                environment, environment.getParseEnvironment(), environment.getParseEnvironment().allocateReturnID(),
+                true, true, false, sharedMethodInfo, methodName,
+                0, null, TranslatorEnvironment.newFrameDescriptor(context));
 
         // ownScopeForAssignments is the same for the defined method as the current one.
 
@@ -1757,8 +1760,9 @@ private RubyNode translateBlockLikeNode(IterParseNode node, boolean isLambda) {
         final ReturnID returnID = isLambda ? parseEnvironment.allocateReturnID() : environment.getReturnID();
 
         final TranslatorEnvironment newEnvironment = new TranslatorEnvironment(
-                context, environment, parseEnvironment, returnID, hasOwnScope, false,
-                false, sharedMethodInfo, environment.getNamedMethodName(), blockDepth, parseEnvironment.allocateBreakID());
+                environment, parseEnvironment, returnID, hasOwnScope, false, false,
+                sharedMethodInfo, environment.getNamedMethodName(), blockDepth, parseEnvironment.allocateBreakID(),
+                TranslatorEnvironment.newFrameDescriptor(context));
         final MethodTranslator methodCompiler = new MethodTranslator(currentNode, context, this, newEnvironment, true, source, parserContext, argsNode);
 
         if (isProc) {

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

@@ -205,8 +205,9 @@ public RubyRootNode parse(RubySource rubySource, ParserContext parserContext, St
 
         final boolean topLevel = parserContext.isTopLevel();
         final boolean isModuleBody = topLevel;
-        final TranslatorEnvironment environment = new TranslatorEnvironment(context, parentEnvironment,
-                        parseEnvironment, parseEnvironment.allocateReturnID(), ownScopeForAssignments, false, isModuleBody, sharedMethodInfo, sharedMethodInfo.getName(), 0, null);
+        final TranslatorEnvironment environment = new TranslatorEnvironment(parentEnvironment, parseEnvironment,
+                parseEnvironment.allocateReturnID(), ownScopeForAssignments, false, isModuleBody,
+                sharedMethodInfo, sharedMethodInfo.getName(), 0, null, TranslatorEnvironment.newFrameDescriptor(context));
 
         // Declare arguments as local variables in the top-level environment - we'll put the values there in a prelude
 
@@ -356,8 +357,9 @@ private TranslatorEnvironment environmentForFrameDescriptor(RubyContext context,
                 null,
                 false);
             // TODO(CS): how do we know if the frame is a block or not?
-            return new TranslatorEnvironment(null, parseEnvironment,
-                        parseEnvironment.allocateReturnID(), true, true, false, sharedMethodInfo, sharedMethodInfo.getName(), 0, null, frameDescriptor);
+            return new TranslatorEnvironment(null, parseEnvironment,  parseEnvironment.allocateReturnID(),
+                    true, true, false,
+                    sharedMethodInfo, sharedMethodInfo.getName(), 0, null, frameDescriptor);
     }
 
     private TranslatorEnvironment environmentForFrame(RubyContext context, MaterializedFrame frame) {
@@ -376,8 +378,9 @@ private TranslatorEnvironment environmentForFrame(RubyContext context, Materiali
                     false);
             final MaterializedFrame parent = RubyArguments.getDeclarationFrame(frame);
             // TODO(CS): how do we know if the frame is a block or not?
-            return new TranslatorEnvironment(environmentForFrame(context, parent), parseEnvironment,
-                            parseEnvironment.allocateReturnID(), true, true, false, sharedMethodInfo, sharedMethodInfo.getName(), 0, null, frame.getFrameDescriptor());
+            return new TranslatorEnvironment(environmentForFrame(context, parent), parseEnvironment, parseEnvironment.allocateReturnID(),
+                    true, true, false,
+                    sharedMethodInfo, sharedMethodInfo.getName(), 0, null, frame.getFrameDescriptor());
         }
     }
 

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

@@ -66,11 +66,8 @@ public TranslatorEnvironment(TranslatorEnvironment parent, ParseEnvironment pars
         this.breakID = breakID;
     }
 
-    public TranslatorEnvironment(RubyContext context, TranslatorEnvironment parent, ParseEnvironment parseEnvironment,
-            ReturnID returnID, boolean ownScopeForAssignments, boolean neverAssignInParentScope,
-            boolean isModuleBody, SharedMethodInfo sharedMethodInfo, String namedMethodName, int blockDepth, BreakID breakID) {
-        this(parent, parseEnvironment, returnID, ownScopeForAssignments, neverAssignInParentScope, isModuleBody, sharedMethodInfo, namedMethodName, blockDepth,
-                breakID, new FrameDescriptor(context.getCoreLibrary().getNil()));
+    public static FrameDescriptor newFrameDescriptor(RubyContext context) {
+        return new FrameDescriptor(context.getCoreLibrary().getNil());
     }
 
     public boolean isDynamicConstantLookup() {