Modify Painless AST to add synthetic functions during semantic pass (#47611)

This has ELambda and ENewArrayFunctionRef add their generated synthetic
methods to the SClass node during the semantic pass and removes this 
data from the write pass. This is the first step to remove "Globals" (mutable 
state) from the write pass.

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

@@ -19,8 +19,6 @@
 
 package org.elasticsearch.painless;
 
-import org.elasticsearch.painless.node.SFunction;
-
 import java.util.BitSet;
 import java.util.HashMap;
 import java.util.Map;
@@ -29,7 +27,6 @@ import java.util.Map;
  * Program-wide globals (initializers, synthetic methods, etc)
  */
 public class Globals {
-    private final Map<String,SFunction> syntheticMethods = new HashMap<>();
     private final Map<String,Constant> constantInitializers = new HashMap<>();
     private final Map<String,Class<?>> classBindings = new HashMap<>();
     private final Map<Object,String> instanceBindings = new HashMap<>();
@@ -40,16 +37,6 @@ public class Globals {
         this.statements = statements;
     }
     
-    /** Adds a new synthetic method to be written. It must be analyzed! */
-    public void addSyntheticMethod(SFunction function) {
-        if (!function.synthetic) {
-            throw new IllegalStateException("method: " + function.name + " is not synthetic");
-        }
-        if (syntheticMethods.put(function.name, function) != null) {
-            throw new IllegalStateException("synthetic method: " + function.name + " already exists");
-        }
-    }
-    
     /** Adds a new constant initializer to be written */
     public void addConstantInitializer(Constant constant) {
         if (constantInitializers.put(constant.name, constant) != null) {
@@ -70,11 +57,6 @@ public class Globals {
         return instanceBindings.computeIfAbsent(instance, key -> "$instance_binding$" + instanceBindings.size());
     }
     
-    /** Returns the current synthetic methods */
-    public Map<String,SFunction> getSyntheticMethods() {
-        return syntheticMethods;
-    }
-    
     /** Returns the current initializers */
     public Map<String,Constant> getConstantInitializers() {
         return constantInitializers;

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

@@ -22,9 +22,9 @@ package org.elasticsearch.painless.node;
 import org.elasticsearch.painless.AnalyzerCaster;
 import org.elasticsearch.painless.Locals;
 import org.elasticsearch.painless.Location;
+import org.elasticsearch.painless.ScriptRoot;
 import org.elasticsearch.painless.lookup.PainlessCast;
 import org.elasticsearch.painless.lookup.PainlessLookupUtility;
-import org.elasticsearch.painless.ScriptRoot;
 
 import java.util.Objects;
 

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

@@ -29,9 +29,9 @@ import org.elasticsearch.painless.Locals;
 import org.elasticsearch.painless.Location;
 import org.elasticsearch.painless.MethodWriter;
 import org.elasticsearch.painless.Operation;
+import org.elasticsearch.painless.ScriptRoot;
 import org.elasticsearch.painless.lookup.PainlessCast;
 import org.elasticsearch.painless.lookup.def;
-import org.elasticsearch.painless.ScriptRoot;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -28,10 +28,10 @@ import org.elasticsearch.painless.Locals;
 import org.elasticsearch.painless.Location;
 import org.elasticsearch.painless.MethodWriter;
 import org.elasticsearch.painless.Operation;
+import org.elasticsearch.painless.ScriptRoot;
 import org.elasticsearch.painless.WriterConstants;
 import org.elasticsearch.painless.lookup.PainlessLookupUtility;
 import org.elasticsearch.painless.lookup.def;
-import org.elasticsearch.painless.ScriptRoot;
 
 import java.util.Objects;
 import java.util.Set;

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

@@ -25,10 +25,10 @@ import org.elasticsearch.painless.Globals;
 import org.elasticsearch.painless.Locals;
 import org.elasticsearch.painless.Location;
 import org.elasticsearch.painless.MethodWriter;
+import org.elasticsearch.painless.ScriptRoot;
 import org.elasticsearch.painless.lookup.PainlessClassBinding;
 import org.elasticsearch.painless.lookup.PainlessInstanceBinding;
 import org.elasticsearch.painless.lookup.PainlessMethod;
-import org.elasticsearch.painless.ScriptRoot;
 import org.elasticsearch.painless.symbol.FunctionTable;
 import org.objectweb.asm.Label;
 import org.objectweb.asm.Type;

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

@@ -28,9 +28,9 @@ import org.elasticsearch.painless.Locals;
 import org.elasticsearch.painless.Locals.Variable;
 import org.elasticsearch.painless.Location;
 import org.elasticsearch.painless.MethodWriter;
+import org.elasticsearch.painless.ScriptRoot;
 import org.elasticsearch.painless.lookup.PainlessLookupUtility;
 import org.elasticsearch.painless.lookup.def;
-import org.elasticsearch.painless.ScriptRoot;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
 

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

@@ -25,9 +25,9 @@ import org.elasticsearch.painless.Globals;
 import org.elasticsearch.painless.Locals;
 import org.elasticsearch.painless.Location;
 import org.elasticsearch.painless.MethodWriter;
+import org.elasticsearch.painless.ScriptRoot;
 import org.elasticsearch.painless.lookup.PainlessCast;
 import org.elasticsearch.painless.lookup.PainlessLookupUtility;
-import org.elasticsearch.painless.ScriptRoot;
 
 import java.util.Objects;
 import java.util.Set;

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

@@ -28,9 +28,9 @@ import org.elasticsearch.painless.Locals;
 import org.elasticsearch.painless.Location;
 import org.elasticsearch.painless.MethodWriter;
 import org.elasticsearch.painless.Operation;
+import org.elasticsearch.painless.ScriptRoot;
 import org.elasticsearch.painless.lookup.PainlessLookupUtility;
 import org.elasticsearch.painless.lookup.def;
-import org.elasticsearch.painless.ScriptRoot;
 import org.objectweb.asm.Label;
 import org.objectweb.asm.Type;
 

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

@@ -25,8 +25,8 @@ import org.elasticsearch.painless.Globals;
 import org.elasticsearch.painless.Locals;
 import org.elasticsearch.painless.Location;
 import org.elasticsearch.painless.MethodWriter;
-import org.elasticsearch.painless.lookup.PainlessLookupUtility;
 import org.elasticsearch.painless.ScriptRoot;
+import org.elasticsearch.painless.lookup.PainlessLookupUtility;
 
 import java.util.Objects;
 import java.util.Set;

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

@@ -27,10 +27,10 @@ import org.elasticsearch.painless.Locals;
 import org.elasticsearch.painless.Locals.Variable;
 import org.elasticsearch.painless.Location;
 import org.elasticsearch.painless.MethodWriter;
+import org.elasticsearch.painless.ScriptRoot;
 import org.elasticsearch.painless.lookup.PainlessLookupUtility;
 import org.elasticsearch.painless.lookup.PainlessMethod;
 import org.elasticsearch.painless.lookup.def;
-import org.elasticsearch.painless.ScriptRoot;
 import org.objectweb.asm.Opcodes;
 
 import java.util.ArrayList;
@@ -185,6 +185,7 @@ public final class ELambda extends AExpression implements ILambda {
         desugared.analyze(scriptRoot, Locals.newLambdaScope(locals.getProgramScope(), desugared.name, returnType,
                                                 desugared.parameters, captures.size(), settings.getMaxLoopCounter()));
         scriptRoot.getFunctionTable().addFunction(desugared.name, desugared.returnType, desugared.typeParameters, true);
+        scriptRoot.getClassNode().addFunction(desugared);
 
         // setup method reference to synthetic method
         if (expected == null) {
@@ -219,9 +220,6 @@ public final class ELambda extends AExpression implements ILambda {
                 methodWriter.visitVarInsn(MethodWriter.getType(capture.clazz).getOpcode(Opcodes.ILOAD), capture.getSlot());
             }
         }
-
-        // add synthetic method to the queue to be written
-        globals.addSyntheticMethod(desugared);
     }
 
     @Override

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

@@ -25,10 +25,10 @@ import org.elasticsearch.painless.Globals;
 import org.elasticsearch.painless.Locals;
 import org.elasticsearch.painless.Location;
 import org.elasticsearch.painless.MethodWriter;
+import org.elasticsearch.painless.ScriptRoot;
 import org.elasticsearch.painless.lookup.PainlessConstructor;
 import org.elasticsearch.painless.lookup.PainlessMethod;
 import org.elasticsearch.painless.lookup.def;
-import org.elasticsearch.painless.ScriptRoot;
 import org.objectweb.asm.Type;
 import org.objectweb.asm.commons.Method;
 

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

@@ -25,10 +25,10 @@ import org.elasticsearch.painless.Globals;
 import org.elasticsearch.painless.Locals;
 import org.elasticsearch.painless.Location;
 import org.elasticsearch.painless.MethodWriter;
+import org.elasticsearch.painless.ScriptRoot;
 import org.elasticsearch.painless.lookup.PainlessConstructor;
 import org.elasticsearch.painless.lookup.PainlessMethod;
 import org.elasticsearch.painless.lookup.def;
-import org.elasticsearch.painless.ScriptRoot;
 import org.objectweb.asm.Type;
 import org.objectweb.asm.commons.Method;
 

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

@@ -75,6 +75,7 @@ public final class ENewArrayFunctionRef extends AExpression implements ILambda {
         function.analyze(scriptRoot, Locals.newLambdaScope(locals.getProgramScope(), function.name, function.returnType,
                 function.parameters, 0, settings.getMaxLoopCounter()));
         scriptRoot.getFunctionTable().addFunction(function.name, function.returnType, function.typeParameters, true);
+        scriptRoot.getClassNode().addFunction(function);
 
         if (expected == null) {
             ref = null;
@@ -97,8 +98,6 @@ public final class ENewArrayFunctionRef extends AExpression implements ILambda {
             // push a null instruction as a placeholder for future lambda instructions
             methodWriter.push((String)null);
         }
-
-        globals.addSyntheticMethod(function);
     }
 
     @Override

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

@@ -25,9 +25,9 @@ import org.elasticsearch.painless.Globals;
 import org.elasticsearch.painless.Locals;
 import org.elasticsearch.painless.Location;
 import org.elasticsearch.painless.MethodWriter;
+import org.elasticsearch.painless.ScriptRoot;
 import org.elasticsearch.painless.lookup.PainlessConstructor;
 import org.elasticsearch.painless.lookup.PainlessLookupUtility;
-import org.elasticsearch.painless.ScriptRoot;
 import org.objectweb.asm.Type;
 import org.objectweb.asm.commons.Method;
 

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

@@ -25,8 +25,8 @@ import org.elasticsearch.painless.Globals;
 import org.elasticsearch.painless.Locals;
 import org.elasticsearch.painless.Location;
 import org.elasticsearch.painless.MethodWriter;
-import org.elasticsearch.painless.lookup.PainlessLookupUtility;
 import org.elasticsearch.painless.ScriptRoot;
+import org.elasticsearch.painless.lookup.PainlessLookupUtility;
 import org.objectweb.asm.Opcodes;
 
 import java.util.Set;

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

@@ -26,8 +26,8 @@ import org.elasticsearch.painless.Globals;
 import org.elasticsearch.painless.Locals;
 import org.elasticsearch.painless.Location;
 import org.elasticsearch.painless.MethodWriter;
-import org.elasticsearch.painless.WriterConstants;
 import org.elasticsearch.painless.ScriptRoot;
+import org.elasticsearch.painless.WriterConstants;
 
 import java.util.Set;
 import java.util.regex.Pattern;

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

@@ -28,9 +28,9 @@ import org.elasticsearch.painless.Locals;
 import org.elasticsearch.painless.Location;
 import org.elasticsearch.painless.MethodWriter;
 import org.elasticsearch.painless.Operation;
+import org.elasticsearch.painless.ScriptRoot;
 import org.elasticsearch.painless.lookup.PainlessLookupUtility;
 import org.elasticsearch.painless.lookup.def;
-import org.elasticsearch.painless.ScriptRoot;
 import org.objectweb.asm.Label;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;

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

@@ -25,9 +25,9 @@ import org.elasticsearch.painless.Globals;
 import org.elasticsearch.painless.Locals;
 import org.elasticsearch.painless.Location;
 import org.elasticsearch.painless.MethodWriter;
+import org.elasticsearch.painless.ScriptRoot;
 import org.elasticsearch.painless.lookup.PainlessLookupUtility;
 import org.elasticsearch.painless.lookup.def;
-import org.elasticsearch.painless.ScriptRoot;
 
 import java.util.List;
 import java.util.Map;

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

@@ -25,9 +25,9 @@ import org.elasticsearch.painless.Globals;
 import org.elasticsearch.painless.Locals;
 import org.elasticsearch.painless.Location;
 import org.elasticsearch.painless.MethodWriter;
+import org.elasticsearch.painless.ScriptRoot;
 import org.elasticsearch.painless.lookup.PainlessMethod;
 import org.elasticsearch.painless.lookup.def;
-import org.elasticsearch.painless.ScriptRoot;
 
 import java.util.List;
 import java.util.Objects;

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

@@ -25,11 +25,11 @@ import org.elasticsearch.painless.Globals;
 import org.elasticsearch.painless.Locals;
 import org.elasticsearch.painless.Location;
 import org.elasticsearch.painless.MethodWriter;
+import org.elasticsearch.painless.ScriptRoot;
 import org.elasticsearch.painless.lookup.PainlessField;
 import org.elasticsearch.painless.lookup.PainlessLookupUtility;
 import org.elasticsearch.painless.lookup.PainlessMethod;
 import org.elasticsearch.painless.lookup.def;
-import org.elasticsearch.painless.ScriptRoot;
 
 import java.util.List;
 import java.util.Map;

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

@@ -25,8 +25,8 @@ import org.elasticsearch.painless.Globals;
 import org.elasticsearch.painless.Locals;
 import org.elasticsearch.painless.Location;
 import org.elasticsearch.painless.MethodWriter;
-import org.elasticsearch.painless.lookup.PainlessMethod;
 import org.elasticsearch.painless.ScriptRoot;
+import org.elasticsearch.painless.lookup.PainlessMethod;
 
 import java.util.List;
 import java.util.Objects;

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

@@ -26,8 +26,8 @@ import org.elasticsearch.painless.Globals;
 import org.elasticsearch.painless.Locals;
 import org.elasticsearch.painless.Location;
 import org.elasticsearch.painless.MethodWriter;
-import org.elasticsearch.painless.lookup.def;
 import org.elasticsearch.painless.ScriptRoot;
+import org.elasticsearch.painless.lookup.def;
 import org.objectweb.asm.Type;
 
 import java.time.ZonedDateTime;

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

@@ -26,8 +26,8 @@ import org.elasticsearch.painless.Globals;
 import org.elasticsearch.painless.Locals;
 import org.elasticsearch.painless.Location;
 import org.elasticsearch.painless.MethodWriter;
-import org.elasticsearch.painless.lookup.def;
 import org.elasticsearch.painless.ScriptRoot;
+import org.elasticsearch.painless.lookup.def;
 import org.objectweb.asm.Type;
 
 import java.time.ZonedDateTime;

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

@@ -26,8 +26,8 @@ import org.elasticsearch.painless.Globals;
 import org.elasticsearch.painless.Locals;
 import org.elasticsearch.painless.Location;
 import org.elasticsearch.painless.MethodWriter;
-import org.elasticsearch.painless.lookup.def;
 import org.elasticsearch.painless.ScriptRoot;
+import org.elasticsearch.painless.lookup.def;
 
 import java.time.ZonedDateTime;
 import java.util.Objects;

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

@@ -25,9 +25,9 @@ import org.elasticsearch.painless.Globals;
 import org.elasticsearch.painless.Locals;
 import org.elasticsearch.painless.Location;
 import org.elasticsearch.painless.MethodWriter;
+import org.elasticsearch.painless.ScriptRoot;
 import org.elasticsearch.painless.lookup.PainlessField;
 import org.elasticsearch.painless.lookup.PainlessLookupUtility;
-import org.elasticsearch.painless.ScriptRoot;
 import org.objectweb.asm.Type;
 
 import java.lang.reflect.Modifier;

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

@@ -25,10 +25,10 @@ import org.elasticsearch.painless.Globals;
 import org.elasticsearch.painless.Locals;
 import org.elasticsearch.painless.Location;
 import org.elasticsearch.painless.MethodWriter;
+import org.elasticsearch.painless.ScriptRoot;
 import org.elasticsearch.painless.WriterConstants;
 import org.elasticsearch.painless.lookup.PainlessLookupUtility;
 import org.elasticsearch.painless.lookup.PainlessMethod;
-import org.elasticsearch.painless.ScriptRoot;
 
 import java.util.Objects;
 import java.util.Set;

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

@@ -25,9 +25,9 @@ import org.elasticsearch.painless.Globals;
 import org.elasticsearch.painless.Locals;
 import org.elasticsearch.painless.Location;
 import org.elasticsearch.painless.MethodWriter;
+import org.elasticsearch.painless.ScriptRoot;
 import org.elasticsearch.painless.lookup.PainlessLookupUtility;
 import org.elasticsearch.painless.lookup.PainlessMethod;
-import org.elasticsearch.painless.ScriptRoot;
 
 import java.util.Objects;
 import java.util.Set;

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

@@ -25,8 +25,8 @@ import org.elasticsearch.painless.Globals;
 import org.elasticsearch.painless.Locals;
 import org.elasticsearch.painless.Location;
 import org.elasticsearch.painless.MethodWriter;
-import org.elasticsearch.painless.lookup.PainlessMethod;
 import org.elasticsearch.painless.ScriptRoot;
+import org.elasticsearch.painless.lookup.PainlessMethod;
 
 import java.util.Set;
 

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

@@ -28,9 +28,9 @@ import org.elasticsearch.painless.Locals.Variable;
 import org.elasticsearch.painless.Location;
 import org.elasticsearch.painless.MethodWriter;
 import org.elasticsearch.painless.ScriptClassInfo;
+import org.elasticsearch.painless.ScriptRoot;
 import org.elasticsearch.painless.WriterConstants;
 import org.elasticsearch.painless.lookup.PainlessLookup;
-import org.elasticsearch.painless.ScriptRoot;
 import org.elasticsearch.painless.symbol.FunctionTable;
 import org.objectweb.asm.ClassVisitor;
 import org.objectweb.asm.Label;
@@ -82,7 +82,7 @@ public final class SClass extends AStatement {
     private final ScriptClassInfo scriptClassInfo;
     private final String name;
     private final Printer debugStream;
-    private final List<SFunction> functions;
+    private final List<SFunction> functions = new ArrayList<>();
     private final Globals globals;
     private final List<AStatement> statements;
 
@@ -100,7 +100,7 @@ public final class SClass extends AStatement {
         this.scriptClassInfo = Objects.requireNonNull(scriptClassInfo);
         this.name = Objects.requireNonNull(name);
         this.debugStream = debugStream;
-        this.functions = Collections.unmodifiableList(functions);
+        this.functions.addAll(Objects.requireNonNull(functions));
         this.statements = Collections.unmodifiableList(statements);
         this.globals = new Globals(new BitSet(sourceText.length()));
 
@@ -108,6 +108,10 @@ public final class SClass extends AStatement {
         this.getMethods = new ArrayList<>();
     }
 
+    void addFunction(SFunction function) {
+        functions.add(function);
+    }
+
     @Override
     public void storeSettings(CompilerSettings settings) {
         for (SFunction function : functions) {
@@ -155,7 +159,11 @@ public final class SClass extends AStatement {
 
     @Override
     void analyze(ScriptRoot scriptRoot, Locals program) {
-        for (SFunction function : this.functions) {
+        // copy protection is required because synthetic functions are
+        // added for lambdas/method references and analysis here is
+        // only for user-defined functions
+        List<SFunction> functions = new ArrayList<>(this.functions);
+        for (SFunction function : functions) {
             Locals functionLocals =
                 Locals.newFunctionScope(program, function.returnType, function.parameters, settings.getMaxLoopCounter());
             function.analyze(scriptRoot, functionLocals);
@@ -281,15 +289,6 @@ public final class SClass extends AStatement {
             function.write(classWriter, globals);
         }
 
-        // Write all synthetic functions. Note that this process may add more :)
-        while (!globals.getSyntheticMethods().isEmpty()) {
-            List<SFunction> current = new ArrayList<>(globals.getSyntheticMethods().values());
-            globals.getSyntheticMethods().clear();
-            for (SFunction function : current) {
-                function.write(classWriter, globals);
-            }
-        }
-
         // Write the constants
         if (false == globals.getConstantInitializers().isEmpty()) {
             Collection<Constant> inits = globals.getConstantInitializers().values();

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

@@ -26,9 +26,9 @@ import org.elasticsearch.painless.Locals;
 import org.elasticsearch.painless.Locals.Variable;
 import org.elasticsearch.painless.Location;
 import org.elasticsearch.painless.MethodWriter;
+import org.elasticsearch.painless.ScriptRoot;
 import org.elasticsearch.painless.lookup.PainlessLookupUtility;
 import org.elasticsearch.painless.lookup.def;
-import org.elasticsearch.painless.ScriptRoot;
 
 import java.util.Objects;
 import java.util.Set;

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

@@ -27,9 +27,9 @@ import org.elasticsearch.painless.Locals.Parameter;
 import org.elasticsearch.painless.Locals.Variable;
 import org.elasticsearch.painless.Location;
 import org.elasticsearch.painless.MethodWriter;
+import org.elasticsearch.painless.ScriptRoot;
 import org.elasticsearch.painless.lookup.PainlessLookup;
 import org.elasticsearch.painless.lookup.PainlessLookupUtility;
-import org.elasticsearch.painless.ScriptRoot;
 import org.objectweb.asm.Opcodes;
 
 import java.lang.invoke.MethodType;

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

@@ -25,8 +25,8 @@ import org.elasticsearch.painless.Globals;
 import org.elasticsearch.painless.Locals;
 import org.elasticsearch.painless.Location;
 import org.elasticsearch.painless.MethodWriter;
-import org.elasticsearch.painless.lookup.PainlessLookupUtility;
 import org.elasticsearch.painless.ScriptRoot;
+import org.elasticsearch.painless.lookup.PainlessLookupUtility;
 
 import java.util.Set;
 

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

@@ -27,9 +27,9 @@ import org.elasticsearch.painless.Locals;
 import org.elasticsearch.painless.Locals.Variable;
 import org.elasticsearch.painless.Location;
 import org.elasticsearch.painless.MethodWriter;
+import org.elasticsearch.painless.ScriptRoot;
 import org.elasticsearch.painless.lookup.PainlessCast;
 import org.elasticsearch.painless.lookup.PainlessLookupUtility;
-import org.elasticsearch.painless.ScriptRoot;
 import org.objectweb.asm.Label;
 import org.objectweb.asm.Opcodes;
 

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

@@ -28,11 +28,11 @@ import org.elasticsearch.painless.Locals;
 import org.elasticsearch.painless.Locals.Variable;
 import org.elasticsearch.painless.Location;
 import org.elasticsearch.painless.MethodWriter;
+import org.elasticsearch.painless.ScriptRoot;
 import org.elasticsearch.painless.lookup.PainlessCast;
 import org.elasticsearch.painless.lookup.PainlessLookupUtility;
 import org.elasticsearch.painless.lookup.PainlessMethod;
 import org.elasticsearch.painless.lookup.def;
-import org.elasticsearch.painless.ScriptRoot;
 import org.objectweb.asm.Label;
 import org.objectweb.asm.Opcodes;