Fix style and import ordering.

Author: Aca-S

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/GraphBuilderContext.java

@@ -28,6 +28,7 @@
 import static jdk.graal.compiler.core.common.type.StampFactory.objectNonNull;
 import static jdk.vm.ci.meta.DeoptimizationAction.InvalidateReprofile;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import jdk.graal.compiler.bytecode.Bytecode;
@@ -82,8 +83,6 @@
 import jdk.vm.ci.meta.JavaType;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
-import java.util.ArrayList;
-
 /**
  * Used by a {@link GraphBuilderPlugin} to interface with an object that parses the bytecode of a
  * single {@linkplain #getMethod() method} as part of building a {@linkplain #getGraph() graph} .

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/IntrinsicGraphBuilder.java

@@ -26,6 +26,9 @@
 
 import static jdk.vm.ci.code.BytecodeFrame.AFTER_BCI;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import jdk.graal.compiler.bytecode.Bytecode;
 import jdk.graal.compiler.core.common.type.Stamp;
 import jdk.graal.compiler.core.common.type.StampFactory;
@@ -76,9 +79,6 @@
 import jdk.vm.ci.meta.ResolvedJavaType;
 import jdk.vm.ci.meta.Signature;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * Implementation of {@link GraphBuilderContext} used to produce a graph for a method based on an
  * {@link InvocationPlugin} for the method.

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/PreParseCallbackSupport.java

@@ -24,13 +24,14 @@
  */
 package com.oracle.svm.hosted;
 
-import jdk.graal.compiler.nodes.graphbuilderconf.IntrinsicContext;
-import jdk.vm.ci.meta.ResolvedJavaMethod;
-import org.graalvm.nativeimage.ImageSingletons;
-
 import java.util.ArrayList;
 import java.util.List;
 
+import org.graalvm.nativeimage.ImageSingletons;
+
+import jdk.graal.compiler.nodes.graphbuilderconf.IntrinsicContext;
+import jdk.vm.ci.meta.ResolvedJavaMethod;
+
 /**
  * Represents a hook for callbacks executed right before the start of method parsing by
  * {@link com.oracle.svm.hosted.phases.SharedGraphBuilderPhase.SharedBytecodeParser}.

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/dataflow/AbstractFrame.java

@@ -24,8 +24,6 @@
  */
 package com.oracle.svm.hosted.dataflow;
 
-import com.oracle.svm.core.util.VMError;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
@@ -35,6 +33,8 @@
 import java.util.function.Function;
 import java.util.function.Predicate;
 
+import com.oracle.svm.core.util.VMError;
+
 /**
  * Abstract representation of a bytecode execution frame, i.e., its
  * {@link AbstractFrame#operandStack operand stack} and {@link AbstractFrame#localVariableTable
@@ -277,6 +277,16 @@ public void transform(Predicate<T> filterFunction, Function<T, T> transformFunct
         }
 
         void put(int index, ValueWithSlots<T> value) {
+            VMError.guarantee(index >= 0, "Local variable table index cannot be negative");
+            ValueWithSlots<T> previousInTable = variables.get(index - 1);
+            if (previousInTable != null && previousInTable.size == ValueWithSlots.Slots.TWO_SLOTS) {
+                /*
+                 * Store operations into a local variable slot occupied by the second half of a two
+                 * slot value is a legal operation, but it invalidates the variable previously
+                 * occupying two slots.
+                 */
+                variables.remove(index - 1);
+            }
             variables.put(index, value);
         }
 

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/dataflow/AbstractInterpreter.java

@@ -24,6 +24,16 @@
  */
 package com.oracle.svm.hosted.dataflow;
 
+import java.util.ArrayList;
+import java.util.BitSet;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.graalvm.collections.Pair;
+
 import jdk.graal.compiler.bytecode.Bytecode;
 import jdk.graal.compiler.bytecode.BytecodeStream;
 import jdk.graal.compiler.debug.DebugContext;
@@ -33,15 +43,6 @@
 import jdk.vm.ci.meta.ExceptionHandler;
 import jdk.vm.ci.meta.JavaType;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
-import org.graalvm.collections.Pair;
-
-import java.util.ArrayList;
-import java.util.BitSet;
-import java.util.HashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
 /**
  * Abstract bytecode forward data-flow analyzer. Abstract program states, represented by {@code S},

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/dataflow/ForwardDataFlowAnalyzer.java

@@ -42,7 +42,6 @@
 import java.util.List;
 import java.util.Objects;
 
-import com.oracle.svm.hosted.PreParseCallbackSupport;
 import com.oracle.svm.hosted.substitute.SubstitutionType;
 import org.graalvm.nativeimage.AnnotationAccess;
 
@@ -76,6 +75,7 @@
 import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.hosted.ExceptionSynthesizer;
 import com.oracle.svm.hosted.LinkAtBuildTimeSupport;
+import com.oracle.svm.hosted.PreParseCallbackSupport;
 import com.oracle.svm.hosted.SharedArenaSupport;
 import com.oracle.svm.hosted.code.FactoryMethodSupport;
 import com.oracle.svm.hosted.code.SubstrateCompilationDirectives;

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/SharedGraphBuilderPhase.java

@@ -47,9 +47,6 @@
 
 import com.oracle.svm.core.TrackDynamicAccessEnabled;
 import com.oracle.svm.hosted.DynamicAccessDetectionFeature;
-import com.oracle.svm.hosted.strictconstantanalysis.ConstantExpressionRegistry;
-import com.oracle.svm.hosted.strictconstantanalysis.InferredDynamicAccessLoggingFeature;
-import com.oracle.svm.hosted.strictconstantanalysis.StrictConstantAnalysisFeature;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.hosted.RuntimeReflection;
 import org.graalvm.nativeimage.impl.RuntimeClassInitializationSupport;
@@ -70,6 +67,9 @@
 import com.oracle.svm.hosted.ImageClassLoader;
 import com.oracle.svm.hosted.ReachabilityRegistrationNode;
 import com.oracle.svm.hosted.classinitialization.ClassInitializationSupport;
+import com.oracle.svm.hosted.strictconstantanalysis.ConstantExpressionRegistry;
+import com.oracle.svm.hosted.strictconstantanalysis.InferredDynamicAccessLoggingFeature;
+import com.oracle.svm.hosted.strictconstantanalysis.StrictConstantAnalysisFeature;
 import com.oracle.svm.hosted.substitute.AnnotationSubstitutionProcessor;
 import com.oracle.svm.hosted.substitute.DeletedElementException;
 import com.oracle.svm.util.ModuleSupport;

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/snippets/ReflectionPlugins.java

@@ -40,9 +40,6 @@
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
-import com.oracle.svm.hosted.strictconstantanalysis.ConstantExpressionRegistry;
-import com.oracle.svm.hosted.strictconstantanalysis.InferredDynamicAccessLoggingFeature;
-import com.oracle.svm.hosted.strictconstantanalysis.StrictConstantAnalysisFeature;
 import org.graalvm.nativeimage.AnnotationAccess;
 import org.graalvm.nativeimage.ImageInfo;
 import org.graalvm.nativeimage.ImageSingletons;
@@ -109,6 +106,9 @@
 import com.oracle.svm.hosted.code.SubstrateCompilationDirectives;
 import com.oracle.svm.hosted.nodes.DeoptProxyNode;
 import com.oracle.svm.hosted.nodes.ReadReservedRegister;
+import com.oracle.svm.hosted.strictconstantanalysis.ConstantExpressionRegistry;
+import com.oracle.svm.hosted.strictconstantanalysis.InferredDynamicAccessLoggingFeature;
+import com.oracle.svm.hosted.strictconstantanalysis.StrictConstantAnalysisFeature;
 import com.oracle.svm.hosted.substitute.AnnotationSubstitutionProcessor;
 
 import jdk.graal.compiler.core.common.CompressEncoding;

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/snippets/SubstrateGraphBuilderPlugins.java

@@ -24,6 +24,20 @@
  */
 package com.oracle.svm.hosted.strictconstantanalysis;
 
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.lang.reflect.Array;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Executable;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.function.Function;
+
 import com.oracle.graal.pointsto.infrastructure.OriginalClassProvider;
 import com.oracle.graal.pointsto.infrastructure.OriginalMethodProvider;
 import com.oracle.graal.pointsto.infrastructure.WrappedConstantPool;
@@ -34,6 +48,7 @@
 import com.oracle.svm.util.TypeResult;
 import com.oracle.svm.hosted.dataflow.AbstractFrame;
 import com.oracle.svm.hosted.dataflow.AbstractInterpreter;
+
 import jdk.graal.compiler.nodes.spi.CoreProviders;
 import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.ConstantPool;
@@ -44,20 +59,6 @@
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 import jdk.vm.ci.meta.ResolvedJavaType;
 
-import java.lang.invoke.MethodHandles;
-import java.lang.invoke.MethodType;
-import java.lang.reflect.Array;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Executable;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.function.Function;
-
 import static jdk.graal.compiler.bytecode.Bytecodes.ACONST_NULL;
 import static jdk.graal.compiler.bytecode.Bytecodes.ANEWARRAY;
 import static jdk.graal.compiler.bytecode.Bytecodes.CHECKCAST;

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/strictconstantanalysis/ConstantExpressionAnalyzer.java

@@ -24,21 +24,23 @@
  */
 package com.oracle.svm.hosted.strictconstantanalysis;
 
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.graalvm.collections.Pair;
+import org.graalvm.nativeimage.ImageSingletons;
+
 import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.util.LogUtils;
+import com.oracle.svm.hosted.dataflow.AbstractFrame;
+import com.oracle.svm.hosted.dataflow.DataFlowAnalysisException;
+
 import jdk.graal.compiler.bytecode.Bytecode;
 import jdk.graal.compiler.bytecode.BytecodeProvider;
 import jdk.graal.compiler.bytecode.ResolvedJavaMethodBytecodeProvider;
-import com.oracle.svm.hosted.dataflow.AbstractFrame;
-import com.oracle.svm.hosted.dataflow.DataFlowAnalysisException;
 import jdk.graal.compiler.nodes.graphbuilderconf.IntrinsicContext;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
-import org.graalvm.collections.Pair;
-import org.graalvm.nativeimage.ImageSingletons;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 
 public class ConstantExpressionRegistry {
 

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/strictconstantanalysis/ConstantExpressionRegistry.java

@@ -24,37 +24,40 @@
  */
 package com.oracle.svm.hosted.strictconstantanalysis;
 
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.graalvm.collections.Pair;
+
 import com.oracle.svm.core.ParsingReason;
 import com.oracle.svm.core.feature.AutomaticallyRegisteredFeature;
 import com.oracle.svm.core.feature.InternalFeature;
 import com.oracle.svm.core.option.HostedOptionKey;
 import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.hosted.ReachabilityRegistrationNode;
 import com.oracle.svm.util.LogUtils;
+
 import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
 import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionStability;
 import jdk.graal.compiler.util.json.JsonBuilder;
 import jdk.graal.compiler.util.json.JsonPrettyWriter;
 import jdk.graal.compiler.util.json.JsonWriter;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
-import org.graalvm.collections.Pair;
-
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-import java.util.Queue;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 @AutomaticallyRegisteredFeature
 public class InferredDynamicAccessLoggingFeature implements InternalFeature {
 
     static class Options {
-        @Option(help = "Specify the .json log file location for inferred dynamic accesses.")//
+        @Option(help = "Specify the .json log file location for inferred dynamic accesses.", stability = OptionStability.EXPERIMENTAL)//
         static final HostedOptionKey<String> InferredDynamicAccessLog = new HostedOptionKey<>(null);
     }
 

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/strictconstantanalysis/InferredDynamicAccessLoggingFeature.java

@@ -24,23 +24,26 @@
  */
 package com.oracle.svm.hosted.strictconstantanalysis;
 
+import java.lang.invoke.MethodType;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationHandler;
+import java.util.function.BooleanSupplier;
+import java.util.function.Predicate;
+
+import org.graalvm.nativeimage.ImageSingletons;
+import org.graalvm.nativeimage.hosted.RuntimeReflection;
+
 import com.oracle.graal.pointsto.util.GraalAccess;
 import com.oracle.svm.core.feature.AutomaticallyRegisteredFeature;
 import com.oracle.svm.core.feature.InternalFeature;
 import com.oracle.svm.core.option.HostedOptionKey;
 import com.oracle.svm.hosted.FeatureImpl;
 import com.oracle.svm.hosted.PreParseCallbackSupport;
 import com.oracle.svm.util.ReflectionUtil;
+
 import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionStability;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
-import org.graalvm.nativeimage.ImageSingletons;
-import org.graalvm.nativeimage.hosted.RuntimeReflection;
-
-import java.lang.invoke.MethodType;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationHandler;
-import java.util.function.BooleanSupplier;
-import java.util.function.Predicate;
 
 /**
  * Feature which enables a graph IR optimization independent analysis of compile-time inferrable
@@ -101,7 +104,7 @@ public enum Mode {
                         Possible values are:
                          "Disable" (default): Disable the strict mode and fall back to the optimization dependent analysis for inferrable dynamic calls;
                          "Warn": Fold both the calls inferred with the strict mode analysis and the optimization dependant analysis, but print a warning for non-strict call folding;
-                         "Enforce": Fold only the calls inferred by the strict analysis mode.""")//
+                         "Enforce": Fold only the calls inferred by the strict analysis mode.""", stability = OptionStability.EXPERIMENTAL)//
         public static final HostedOptionKey<Mode> StrictConstantAnalysis = new HostedOptionKey<>(Mode.Disable);
     }