Remove extraneous pass (#49797)

This removes the storeSettings pass where nodes in the AST could store 
information they needed out of CompilerSettings for use during later 
passes. CompilerSettings is part of ScriptRoot which is available during the 
analysis pass making the storeSettings pass redundant.

Author: jdconrad

modules/lang-painless/src/main/java/org/elasticsearch/painless/Compiler.java

@@ -211,8 +211,7 @@ Constructor<?> compile(Loader loader, Set<String> extractedVariables, String nam
         ScriptClassInfo scriptClassInfo = new ScriptClassInfo(painlessLookup, scriptClass);
         SClass root = Walker.buildPainlessTree(scriptClassInfo, name, source, settings, painlessLookup, null);
         root.extractVariables(extractedVariables);
-        root.storeSettings(settings);
-        root.analyze(painlessLookup);
+        root.analyze(painlessLookup, settings);
         Map<String, Object> statics = root.write();
 
         try {
@@ -243,8 +242,7 @@ byte[] compile(String name, String source, CompilerSettings settings, Printer de
         SClass root = Walker.buildPainlessTree(scriptClassInfo, name, source, settings, painlessLookup,
                 debugStream);
         root.extractVariables(new HashSet<>());
-        root.storeSettings(settings);
-        root.analyze(painlessLookup);
+        root.analyze(painlessLookup, settings);
         root.write();
 
         return root.getBytes();

modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ANode.java

@@ -20,7 +20,6 @@
 package org.elasticsearch.painless.node;
 
 import org.elasticsearch.painless.ClassWriter;
-import org.elasticsearch.painless.CompilerSettings;
 import org.elasticsearch.painless.Globals;
 import org.elasticsearch.painless.Locals;
 import org.elasticsearch.painless.Location;
@@ -56,11 +55,6 @@ public abstract class ANode {
         this.location = Objects.requireNonNull(location);
     }
 
-    /**
-     * Store settings required for future compiler passes.
-     */
-    abstract void storeSettings(CompilerSettings settings);
-
     /**
      * Adds all variable names referenced to the variable set.
      * <p>

modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EAssignment.java

@@ -22,7 +22,6 @@
 
 import org.elasticsearch.painless.AnalyzerCaster;
 import org.elasticsearch.painless.ClassWriter;
-import org.elasticsearch.painless.CompilerSettings;
 import org.elasticsearch.painless.DefBootstrap;
 import org.elasticsearch.painless.Globals;
 import org.elasticsearch.painless.Locals;
@@ -65,15 +64,6 @@ public EAssignment(Location location, AExpression lhs, AExpression rhs, boolean
         this.operation = operation;
     }
 
-    @Override
-    void storeSettings(CompilerSettings settings) {
-        lhs.storeSettings(settings);
-
-        if (rhs != null) {
-            rhs.storeSettings(settings);
-        }
-    }
-
     @Override
     void extractVariables(Set<String> variables) {
         lhs.extractVariables(variables);

modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EBinary.java

@@ -21,7 +21,6 @@
 
 import org.elasticsearch.painless.AnalyzerCaster;
 import org.elasticsearch.painless.ClassWriter;
-import org.elasticsearch.painless.CompilerSettings;
 import org.elasticsearch.painless.DefBootstrap;
 import org.elasticsearch.painless.Globals;
 import org.elasticsearch.painless.Locals;
@@ -60,12 +59,6 @@ public EBinary(Location location, Operation operation, AExpression left, AExpres
         this.right = Objects.requireNonNull(right);
     }
 
-    @Override
-    void storeSettings(CompilerSettings settings) {
-        left.storeSettings(settings);
-        right.storeSettings(settings);
-    }
-
     @Override
     void extractVariables(Set<String> variables) {
         left.extractVariables(variables);

modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EBool.java

@@ -20,7 +20,6 @@
 package org.elasticsearch.painless.node;
 
 import org.elasticsearch.painless.ClassWriter;
-import org.elasticsearch.painless.CompilerSettings;
 import org.elasticsearch.painless.Globals;
 import org.elasticsearch.painless.Locals;
 import org.elasticsearch.painless.Location;
@@ -50,12 +49,6 @@ public EBool(Location location, Operation operation, AExpression left, AExpressi
         this.right = Objects.requireNonNull(right);
     }
 
-    @Override
-    void storeSettings(CompilerSettings settings) {
-        left.storeSettings(settings);
-        right.storeSettings(settings);
-    }
-
     @Override
     void extractVariables(Set<String> variables) {
         left.extractVariables(variables);

modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EBoolean.java

@@ -20,7 +20,6 @@
 package org.elasticsearch.painless.node;
 
 import org.elasticsearch.painless.ClassWriter;
-import org.elasticsearch.painless.CompilerSettings;
 import org.elasticsearch.painless.Globals;
 import org.elasticsearch.painless.Locals;
 import org.elasticsearch.painless.Location;
@@ -40,11 +39,6 @@ public EBoolean(Location location, boolean constant) {
         this.constant = constant;
     }
 
-    @Override
-    void storeSettings(CompilerSettings settings) {
-        // Do nothing.
-    }
-
     @Override
     void extractVariables(Set<String> variables) {
         // Do nothing.

modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ECallLocal.java

@@ -20,7 +20,6 @@
 package org.elasticsearch.painless.node;
 
 import org.elasticsearch.painless.ClassWriter;
-import org.elasticsearch.painless.CompilerSettings;
 import org.elasticsearch.painless.Globals;
 import org.elasticsearch.painless.Locals;
 import org.elasticsearch.painless.Location;
@@ -64,13 +63,6 @@ public ECallLocal(Location location, String name, List<AExpression> arguments) {
         this.arguments = Objects.requireNonNull(arguments);
     }
 
-    @Override
-    void storeSettings(CompilerSettings settings) {
-        for (AExpression argument : arguments) {
-            argument.storeSettings(settings);
-        }
-    }
-
     @Override
     void extractVariables(Set<String> variables) {
         for (AExpression argument : arguments) {

modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ECapturingFunctionRef.java

@@ -20,7 +20,6 @@
 package org.elasticsearch.painless.node;
 
 import org.elasticsearch.painless.ClassWriter;
-import org.elasticsearch.painless.CompilerSettings;
 import org.elasticsearch.painless.DefBootstrap;
 import org.elasticsearch.painless.FunctionRef;
 import org.elasticsearch.painless.Globals;
@@ -55,11 +54,6 @@ public ECapturingFunctionRef(Location location, String variable, String call) {
         this.call = Objects.requireNonNull(call);
     }
 
-    @Override
-    void storeSettings(CompilerSettings settings) {
-        // Do nothing.
-    }
-
     @Override
     void extractVariables(Set<String> variables) {
         variables.add(variable);

modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ECast.java

@@ -20,7 +20,6 @@
 package org.elasticsearch.painless.node;
 
 import org.elasticsearch.painless.ClassWriter;
-import org.elasticsearch.painless.CompilerSettings;
 import org.elasticsearch.painless.Globals;
 import org.elasticsearch.painless.Locals;
 import org.elasticsearch.painless.Location;
@@ -47,11 +46,6 @@ final class ECast extends AExpression {
         this.cast = Objects.requireNonNull(cast);
     }
 
-    @Override
-    void storeSettings(CompilerSettings settings) {
-        throw createError(new IllegalStateException("illegal tree structure"));
-    }
-
     @Override
     void extractVariables(Set<String> variables) {
         throw createError(new IllegalStateException("Illegal tree structure."));

modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EComp.java

@@ -21,7 +21,6 @@
 
 import org.elasticsearch.painless.AnalyzerCaster;
 import org.elasticsearch.painless.ClassWriter;
-import org.elasticsearch.painless.CompilerSettings;
 import org.elasticsearch.painless.DefBootstrap;
 import org.elasticsearch.painless.Globals;
 import org.elasticsearch.painless.Locals;
@@ -59,12 +58,6 @@ public EComp(Location location, Operation operation, AExpression left, AExpressi
         this.right = Objects.requireNonNull(right);
     }
 
-    @Override
-    void storeSettings(CompilerSettings settings) {
-        left.storeSettings(settings);
-        right.storeSettings(settings);
-    }
-
     @Override
     void extractVariables(Set<String> variables) {
         left.extractVariables(variables);

modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EConditional.java

@@ -21,7 +21,6 @@
 
 import org.elasticsearch.painless.AnalyzerCaster;
 import org.elasticsearch.painless.ClassWriter;
-import org.elasticsearch.painless.CompilerSettings;
 import org.elasticsearch.painless.Globals;
 import org.elasticsearch.painless.Locals;
 import org.elasticsearch.painless.Location;
@@ -50,13 +49,6 @@ public EConditional(Location location, AExpression condition, AExpression left,
         this.right = Objects.requireNonNull(right);
     }
 
-    @Override
-    void storeSettings(CompilerSettings settings) {
-        condition.storeSettings(settings);
-        left.storeSettings(settings);
-        right.storeSettings(settings);
-    }
-
     @Override
     void extractVariables(Set<String> variables) {
         condition.extractVariables(variables);

modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EConstant.java

@@ -20,7 +20,6 @@
 package org.elasticsearch.painless.node;
 
 import org.elasticsearch.painless.ClassWriter;
-import org.elasticsearch.painless.CompilerSettings;
 import org.elasticsearch.painless.Globals;
 import org.elasticsearch.painless.Locals;
 import org.elasticsearch.painless.Location;
@@ -41,11 +40,6 @@ final class EConstant extends AExpression {
         this.constant = constant;
     }
 
-    @Override
-    void storeSettings(CompilerSettings settings) {
-        throw new IllegalStateException("illegal tree structure");
-    }
-
     @Override
     void extractVariables(Set<String> variables) {
         throw new IllegalStateException("Illegal tree structure.");

modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EDecimal.java

@@ -20,7 +20,6 @@
 package org.elasticsearch.painless.node;
 
 import org.elasticsearch.painless.ClassWriter;
-import org.elasticsearch.painless.CompilerSettings;
 import org.elasticsearch.painless.Globals;
 import org.elasticsearch.painless.Locals;
 import org.elasticsearch.painless.Location;
@@ -43,11 +42,6 @@ public EDecimal(Location location, String value) {
         this.value = Objects.requireNonNull(value);
     }
 
-    @Override
-    void storeSettings(CompilerSettings settings) {
-        // Do nothing.
-    }
-
     @Override
     void extractVariables(Set<String> variables) {
         // Do nothing.

modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EElvis.java

@@ -21,7 +21,6 @@
 
 import org.elasticsearch.painless.AnalyzerCaster;
 import org.elasticsearch.painless.ClassWriter;
-import org.elasticsearch.painless.CompilerSettings;
 import org.elasticsearch.painless.Globals;
 import org.elasticsearch.painless.Locals;
 import org.elasticsearch.painless.Location;
@@ -48,12 +47,6 @@ public EElvis(Location location, AExpression lhs, AExpression rhs) {
         this.rhs = requireNonNull(rhs);
     }
 
-    @Override
-    void storeSettings(CompilerSettings settings) {
-        lhs.storeSettings(settings);
-        rhs.storeSettings(settings);
-    }
-
     @Override
     void extractVariables(Set<String> variables) {
         lhs.extractVariables(variables);

modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EExplicit.java

@@ -20,7 +20,6 @@
 package org.elasticsearch.painless.node;
 
 import org.elasticsearch.painless.ClassWriter;
-import org.elasticsearch.painless.CompilerSettings;
 import org.elasticsearch.painless.Globals;
 import org.elasticsearch.painless.Locals;
 import org.elasticsearch.painless.Location;
@@ -45,11 +44,6 @@ public EExplicit(Location location, String type, AExpression child) {
         this.child = Objects.requireNonNull(child);
     }
 
-    @Override
-    void storeSettings(CompilerSettings settings) {
-        child.storeSettings(settings);
-    }
-
     @Override
     void extractVariables(Set<String> variables) {
         child.extractVariables(variables);

modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EFunctionRef.java

@@ -20,7 +20,6 @@
 package org.elasticsearch.painless.node;
 
 import org.elasticsearch.painless.ClassWriter;
-import org.elasticsearch.painless.CompilerSettings;
 import org.elasticsearch.painless.FunctionRef;
 import org.elasticsearch.painless.Globals;
 import org.elasticsearch.painless.Locals;
@@ -49,11 +48,6 @@ public EFunctionRef(Location location, String type, String call) {
         this.call = Objects.requireNonNull(call);
     }
 
-    @Override
-    void storeSettings(CompilerSettings settings) {
-        // do nothing
-    }
-
     @Override
     void extractVariables(Set<String> variables) {
         // do nothing

modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EInstanceof.java

@@ -20,7 +20,6 @@
 package org.elasticsearch.painless.node;
 
 import org.elasticsearch.painless.ClassWriter;
-import org.elasticsearch.painless.CompilerSettings;
 import org.elasticsearch.painless.Globals;
 import org.elasticsearch.painless.Locals;
 import org.elasticsearch.painless.Location;
@@ -50,11 +49,6 @@ public EInstanceof(Location location, AExpression expression, String type) {
         this.type = Objects.requireNonNull(type);
     }
 
-    @Override
-    void storeSettings(CompilerSettings settings) {
-        expression.storeSettings(settings);
-    }
-
     @Override
     void extractVariables(Set<String> variables) {
         expression.extractVariables(variables);

modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ELambda.java

@@ -20,7 +20,6 @@
 package org.elasticsearch.painless.node;
 
 import org.elasticsearch.painless.ClassWriter;
-import org.elasticsearch.painless.CompilerSettings;
 import org.elasticsearch.painless.FunctionRef;
 import org.elasticsearch.painless.Globals;
 import org.elasticsearch.painless.Locals;
@@ -68,8 +67,6 @@ public final class ELambda extends AExpression implements ILambda {
     private final List<String> paramNameStrs;
     private final List<AStatement> statements;
 
-    private CompilerSettings settings;
-
     // extracted variables required to determine captures
     private final Set<String> extractedVariables;
     // desugared synthetic method (lambda body)
@@ -92,15 +89,6 @@ public ELambda(Location location,
         this.extractedVariables = new HashSet<>();
     }
 
-    @Override
-    void storeSettings(CompilerSettings settings) {
-        for (AStatement statement : statements) {
-            statement.storeSettings(settings);
-        }
-
-        this.settings = settings;
-    }
-
     @Override
     void extractVariables(Set<String> variables) {
         for (AStatement statement : statements) {
@@ -180,10 +168,9 @@ void analyze(ScriptRoot scriptRoot, Locals locals) {
         desugared = new SFunction(
                 location, PainlessLookupUtility.typeToCanonicalTypeName(returnType), name, paramTypes, paramNames,
                 new SBlock(location, statements), true);
-        desugared.storeSettings(settings);
         desugared.generateSignature(scriptRoot.getPainlessLookup());
         desugared.analyze(scriptRoot, Locals.newLambdaScope(locals.getProgramScope(), desugared.name, returnType,
-                                                desugared.parameters, captures.size(), settings.getMaxLoopCounter()));
+                desugared.parameters, captures.size(), scriptRoot.getCompilerSettings().getMaxLoopCounter()));
         scriptRoot.getFunctionTable().addFunction(desugared.name, desugared.returnType, desugared.typeParameters, true);
         scriptRoot.getClassNode().addFunction(desugared);