Style fixes.

Author: Aca-S

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

@@ -28,6 +28,8 @@
 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.Collections;
 import java.util.List;
 
 import jdk.graal.compiler.bytecode.Bytecode;
@@ -82,8 +84,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} .
@@ -296,7 +296,7 @@ default List<StackTraceElement> getInliningCallStack(boolean ignoreInvocationPlu
         for (GraphBuilderContext cur = this; cur != null; cur = cur.getParent()) {
             callStack.add(cur.getMethod().asStackTraceElement(cur.bci()));
         }
-        return callStack;
+        return Collections.unmodifiableList(callStack);
     }
 
     /**

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.Collections;
+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.
@@ -330,7 +330,7 @@ public int getDepth() {
 
     @Override
     public List<StackTraceElement> getInliningCallStack(boolean ignoreInvocationPluginTarget) {
-        return new ArrayList<>();
+        return Collections.emptyList();
     }
 
     @Override

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

@@ -425,7 +425,7 @@ public List<StackTraceElement> getInliningCallStack(boolean ignoreInvocationPlug
             if (isParsingInvocationPlugin() && ignoreInvocationPluginTarget) {
                 callStack.removeFirst();
             }
-            return callStack;
+            return Collections.unmodifiableList(callStack);
         }
 
         @Override

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

@@ -945,7 +945,6 @@ protected void setupNativeImage(String imageName, OptionValues options, Map<Meth
                 ImageSingletons.add(ClassLoaderSupport.class, classLoaderSupport);
                 ImageSingletons.add(LinkAtBuildTimeSupport.class, new LinkAtBuildTimeSupport(loader, classLoaderSupport));
                 ImageSingletons.add(ObservableImageHeapMapProvider.class, new ObservableImageHeapMapProviderImpl());
-                ImageSingletons.add(PreParseCallbackSupport.class, new PreParseCallbackSupport());
 
                 ClassInitializationSupport classInitializationSupport = new ClassInitializationSupport(originalMetaAccess, loader);
                 ImageSingletons.add(RuntimeClassInitializationSupport.class, classInitializationSupport);

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

@@ -57,9 +57,6 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-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.RuntimeResourceAccess;
 import org.graalvm.nativeimage.impl.ConfigurationCondition;
@@ -95,6 +92,9 @@
 import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.hosted.classinitialization.ClassInitializationSupport;
 import com.oracle.svm.hosted.config.ConfigurationParserUtils;
+import com.oracle.svm.hosted.dynamicaccessinference.ConstantExpressionRegistry;
+import com.oracle.svm.hosted.dynamicaccessinference.DynamicAccessInferenceLoggingFeature;
+import com.oracle.svm.hosted.dynamicaccessinference.StrictDynamicAccessInferenceFeature;
 import com.oracle.svm.hosted.imagelayer.HostedImageLayerBuildingSupport;
 import com.oracle.svm.hosted.jdk.localization.LocalizationFeature;
 import com.oracle.svm.hosted.reflect.NativeImageConditionResolver;
@@ -717,7 +717,7 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
                     String resource = SubstrateGraphBuilderPlugins.asConstantObject(b, String.class, arg);
                     return processInferredResourceAccess(b, targetMethod, reason, resolveResourceName, clazz, resource);
                 };
-                return StrictConstantAnalysisFeature.tryToInfer(strictModeRoutine, graphModeRoutine);
+                return StrictDynamicAccessInferenceFeature.tryToInfer(reason, strictModeRoutine, graphModeRoutine);
             }
         });
     }
@@ -731,7 +731,7 @@ private static boolean processInferredResourceAccess(GraphBuilderContext b, Reso
                 throw VMError.shouldNotReachHere(e);
             }
             b.add(ReachabilityRegistrationNode.create(() -> RuntimeResourceAccess.addResource(clazz.getModule(), resourceName), reason));
-            InferredDynamicAccessLoggingFeature.logRegistration(b, reason, targetMethod, clazz, new Object[]{resource});
+            DynamicAccessInferenceLoggingFeature.logRegistration(b, reason, targetMethod, clazz, new Object[]{resource});
             return true;
         }
         return false;

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

@@ -24,7 +24,6 @@
  */
 package com.oracle.svm.hosted.classinitialization;
 
-import com.oracle.svm.hosted.PreParseCallbackSupport;
 import com.oracle.svm.hosted.phases.SharedGraphBuilderPhase;
 
 import jdk.graal.compiler.java.BytecodeParser;
@@ -74,7 +73,7 @@ protected BytecodeParser createBytecodeParser(StructuredGraph graph, BytecodePar
     static class ClassInitializerBytecodeParser extends SharedBytecodeParser {
         ClassInitializerBytecodeParser(GraphBuilderPhase.Instance graphBuilderInstance, StructuredGraph graph, BytecodeParser parent, ResolvedJavaMethod method, int entryBCI,
                         IntrinsicContext intrinsicContext) {
-            super(graphBuilderInstance, graph, parent, method, entryBCI, intrinsicContext, true, false, PreParseCallbackSupport.singleton());
+            super(graphBuilderInstance, graph, parent, method, entryBCI, intrinsicContext, true, false);
         }
     }
 }

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/ClassInitializerGraphBuilderPhase.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);
         }