Minor cleanups

Author: blaumeise20

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/java/BytecodeParser.java

@@ -537,7 +537,7 @@ public boolean canMergeIntrinsicReturns() {
      * A scoped object for tasks to be performed after inlining during parsing such as processing
      * {@linkplain BytecodeFrame#isPlaceholderBci(int) placeholder} frames states.
      */
-    static class InliningScope implements AutoCloseable {
+    protected static class InliningScope implements AutoCloseable {
         final ResolvedJavaMethod callee;
         FrameState stateBefore;
         final Mark mark;
@@ -971,7 +971,7 @@ protected BytecodeParser(GraphBuilderPhase.Instance graphBuilderInstance, Struct
                     int entryBCI, IntrinsicContext intrinsicContext) {
         super(graphBuilderInstance.providers);
         invocationPluginReceiver = new InvocationPluginReceiver(this);
-        this.bytecodeProvider = intrinsicContext == null ? new ResolvedJavaMethodBytecodeProvider() : intrinsicContext.getBytecodeProvider();
+        this.bytecodeProvider = intrinsicContext == null ? ResolvedJavaMethodBytecodeProvider.INSTANCE : intrinsicContext.getBytecodeProvider();
         this.code = bytecodeProvider.getBytecode(method);
         this.method = code.getMethod();
         this.graphBuilderInstance = graphBuilderInstance;

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/MemoryMapControlSinkNode.java

@@ -33,7 +33,7 @@
 import jdk.graal.compiler.nodes.memory.MemoryMapNode;
 
 /**
- * {@link ControlSinkNode}that might have a {@link MemoryMapNode} attached. This map can be used to
+ * {@link ControlSinkNode} that might have a {@link MemoryMapNode} attached. This map can be used to
  * update the memory graph during inlining.
  */
 @NodeInfo

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

@@ -60,7 +60,7 @@
  * A graph decoder that provides all necessary encoded graphs on-the-fly (by parsing the methods and
  * encoding the graphs).
  */
-public class CachingPEGraphDecoder extends PEGraphDecoder {
+public final class CachingPEGraphDecoder extends PEGraphDecoder {
 
     private static final TimerKey BuildGraphTimer = DebugContext.timer("PartialEvaluation-GraphBuilding");
 

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

@@ -878,7 +878,7 @@ public PEGraphDecoder(Architecture architecture, StructuredGraph graph, CoreProv
         this.forceLink = forceLink;
     }
 
-    protected static LoopExplosionKind loopExplosionKind(ResolvedJavaMethod method, LoopExplosionPlugin loopExplosionPlugin) {
+    private static LoopExplosionKind loopExplosionKind(ResolvedJavaMethod method, LoopExplosionPlugin loopExplosionPlugin) {
         if (loopExplosionPlugin == null) {
             return LoopExplosionKind.NONE;
         } else {

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/PartialEvaluator.java

@@ -367,22 +367,14 @@ private final class PELoopExplosionPlugin implements LoopExplosionPlugin {
         @Override
         public LoopExplosionKind loopExplosionKind(ResolvedJavaMethod method) {
             TruffleCompilerRuntime.LoopExplosionKind explosionKind = getMethodInfo(method).loopExplosion();
-            switch (explosionKind) {
-                case NONE:
-                    return LoopExplosionKind.NONE;
-                case FULL_EXPLODE:
-                    return LoopExplosionKind.FULL_EXPLODE;
-                case FULL_EXPLODE_UNTIL_RETURN:
-                    return LoopExplosionKind.FULL_EXPLODE_UNTIL_RETURN;
-                case FULL_UNROLL:
-                    return LoopExplosionKind.FULL_UNROLL;
-                case MERGE_EXPLODE:
-                    return LoopExplosionKind.MERGE_EXPLODE;
-                case FULL_UNROLL_UNTIL_RETURN:
-                    return LoopExplosionKind.FULL_UNROLL_UNTIL_RETURN;
-                default:
-                    throw new IllegalStateException("Unsupported TruffleCompilerRuntime.LoopExplosionKind: " + String.valueOf(explosionKind));
-            }
+            return switch (explosionKind) {
+                case NONE -> LoopExplosionKind.NONE;
+                case FULL_EXPLODE -> LoopExplosionKind.FULL_EXPLODE;
+                case FULL_EXPLODE_UNTIL_RETURN -> LoopExplosionKind.FULL_EXPLODE_UNTIL_RETURN;
+                case FULL_UNROLL -> LoopExplosionKind.FULL_UNROLL;
+                case MERGE_EXPLODE -> LoopExplosionKind.MERGE_EXPLODE;
+                case FULL_UNROLL_UNTIL_RETURN -> LoopExplosionKind.FULL_UNROLL_UNTIL_RETURN;
+            };
         }
     }
 
@@ -422,13 +414,12 @@ private GraphBuilderConfiguration getGraphBuilderConfigurationCopy(boolean force
     protected abstract GraphBuilderPhase.Instance createGraphBuilderPhaseInstance(CoreProviders providers, GraphBuilderConfiguration graphBuilderConfig, OptimisticOptimizations optimisticOpts);
 
     @SuppressWarnings("try")
-    public void doGraphPE(TruffleTierContext context, InlineInvokePlugin inlineInvokePlugin, EconomicMap<ResolvedJavaMethod, EncodedGraph> graphCache) {
-        InlineInvokePlugin[] inlineInvokePlugins = new InlineInvokePlugin[]{
-                        inlineInvokePlugin
-        };
+    public final void doGraphPE(TruffleTierContext context, InlineInvokePlugin inlineInvokePlugin, EconomicMap<ResolvedJavaMethod, EncodedGraph> graphCache) {
         PEGraphDecoder decoder = createGraphDecoder(context,
                         context.isFirstTier() ? firstTierDecodingPlugins : lastTierDecodingPlugins,
-                        inlineInvokePlugins,
+                        new InlineInvokePlugin[]{
+                                        inlineInvokePlugin
+                        },
                         new InterceptReceiverPlugin(context.compilable),
                         nodePlugins,
                         new TruffleSourceLanguagePositionProvider(context.task),

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/host/TruffleKnownHostTypes.java

@@ -78,7 +78,7 @@ public boolean isInInterpreterFastPath(ResolvedJavaMethod method) {
     }
 
     /**
-     * Determines if {@code method} is a method is a transferToInterpreter method from
+     * Determines if {@code method} is a transferToInterpreter method from
      * CompilerDirectives.
      */
     public boolean isTransferToInterpreterMethod(ResolvedJavaMethod method) {

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/frame/NewFrameNode.java

@@ -80,11 +80,11 @@ public final class NewFrameNode extends FixedWithNextNode implements IterableNod
      */
     public static final byte FrameSlotKindObjectTag = 0; // FrameSlotKind.Object.tag
     public static final byte FrameSlotKindLongTag = 1; // FrameSlotKind.Long.tag
-    private static final byte FrameSlotKindIntTag = 2; // FrameSlotKind.Int.tag
-    private static final byte FrameSlotKindDoubleTag = 3; // FrameSlotKind.Double.tag
-    private static final byte FrameSlotKindFloatTag = 4; // FrameSlotKind.Float.tag
-    private static final byte FrameSlotKindBooleanTag = 5; // FrameSlotKind.Boolean.tag
-    private static final byte FrameSlotKindByteTag = 6; // FrameSlotKind.Byte.tag
+    public static final byte FrameSlotKindIntTag = 2; // FrameSlotKind.Int.tag
+    public static final byte FrameSlotKindDoubleTag = 3; // FrameSlotKind.Double.tag
+    public static final byte FrameSlotKindFloatTag = 4; // FrameSlotKind.Float.tag
+    public static final byte FrameSlotKindBooleanTag = 5; // FrameSlotKind.Boolean.tag
+    public static final byte FrameSlotKindByteTag = 6; // FrameSlotKind.Byte.tag
     public static final byte FrameSlotKindIllegalTag = 7; // FrameSlotKind.Illegal.tag
     public static final byte FrameSlotKindStaticTag = 8; // FrameSlotKind.Static.tag
 

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/inlining/AgnosticInliningPhase.java

@@ -60,22 +60,18 @@ public AgnosticInliningPhase(PartialEvaluator partialEvaluator, PostPartialEvalu
         this.postPartialEvaluationSuite = postPartialEvaluationSuite;
     }
 
-    private static InliningPolicyProvider chosenProvider(String name) {
-        for (InliningPolicyProvider provider : AgnosticInliningPhase.POLICY_PROVIDERS) {
-            if (provider.getName().equals(name)) {
-                return provider;
-            }
-        }
-        throw new IllegalStateException("No inlining policy provider with provided name: " + name);
-    }
-
     private static InliningPolicyProvider getInliningPolicyProvider(TruffleTierContext context) {
         boolean firstTier = context.isFirstTier();
         final String policy = (firstTier ? TruffleCompilerOptions.FirstTierInliningPolicy : TruffleCompilerOptions.InliningPolicy).getValue(context.compilerOptions);
         if (Objects.equals(policy, "")) {
             return POLICY_PROVIDERS.get(firstTier ? POLICY_PROVIDERS.size() - 1 : 0);
         } else {
-            return chosenProvider(policy);
+            for (InliningPolicyProvider provider : POLICY_PROVIDERS) {
+                if (provider.getName().equals(policy)) {
+                    return provider;
+                }
+            }
+            throw new IllegalStateException("No inlining policy provider with provided name: " + policy);
         }
     }
 

truffle/src/com.oracle.truffle.runtime/src/com/oracle/truffle/runtime/OptimizedCallTarget.java

@@ -829,7 +829,7 @@ private boolean frameDescriptorEquals(FrameDescriptor parentFrameDescriptor) {
         return false;
     }
 
-    private Object executeRootNode(VirtualFrame frame, CompilationState tier) {
+    private final Object executeRootNode(VirtualFrame frame, CompilationState tier) {
         try {
             Object toRet = rootNode.execute(frame);
             TruffleSafepoint.poll(rootNode);