Remove partial evaluator parameter

Author: blaumeise20

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/AgnosticInliningPhaseTest.java

@@ -85,7 +85,7 @@ public boolean hasNextTier() {
                                 return false;
                             }
                         }, null);
-        final AgnosticInliningPhase agnosticInliningPhase = new AgnosticInliningPhase(partialEvaluator,
+        final AgnosticInliningPhase agnosticInliningPhase = new AgnosticInliningPhase(
                         new PostPartialEvaluationSuite(compiler.getOrCreateCompilerOptions(callTarget), false));
         agnosticInliningPhase.apply(context.graph, context);
         return context.graph;

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

@@ -323,7 +323,7 @@ public void initialize(TruffleCompilable compilable, boolean firstInitialization
 
     // Hook for SVM
     protected TruffleTier newTruffleTier(OptionValues options) {
-        return new TruffleTier(options, partialEvaluator,
+        return new TruffleTier(options,
                         new InstrumentationSuite(partialEvaluator.instrumentationCfg, partialEvaluator.getInstrumentation()),
                         new PostPartialEvaluationSuite(options, TruffleCompilerOptions.IterativePartialEscape.getValue(options)));
     }

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/TruffleTier.java

@@ -26,7 +26,6 @@
 
 import jdk.graal.compiler.core.phases.BaseTier;
 import jdk.graal.compiler.options.OptionValues;
-import jdk.graal.compiler.truffle.PartialEvaluator;
 import jdk.graal.compiler.truffle.PostPartialEvaluationSuite;
 import jdk.graal.compiler.truffle.TruffleCompilerOptions;
 import jdk.graal.compiler.truffle.TruffleTierContext;
@@ -35,8 +34,8 @@
 public class TruffleTier extends BaseTier<TruffleTierContext> {
 
     @SuppressWarnings("this-escape")
-    public TruffleTier(OptionValues options, PartialEvaluator partialEvaluator, InstrumentationSuite instrumentationSuite, PostPartialEvaluationSuite postPartialEvaluationSuite) {
-        appendPhase(new AgnosticInliningPhase(partialEvaluator, postPartialEvaluationSuite));
+    public TruffleTier(OptionValues options, InstrumentationSuite instrumentationSuite, PostPartialEvaluationSuite postPartialEvaluationSuite) {
+        appendPhase(new AgnosticInliningPhase(postPartialEvaluationSuite));
         appendPhase(instrumentationSuite);
         appendPhase(new ReportPerformanceWarningsPhase());
         appendPhase(new VerifyFrameDoesNotEscapePhase());

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

@@ -32,7 +32,6 @@
 import jdk.graal.compiler.phases.BasePhase;
 import jdk.graal.compiler.phases.util.GraphOrder;
 import jdk.graal.compiler.serviceprovider.GraalServices;
-import jdk.graal.compiler.truffle.PartialEvaluator;
 import jdk.graal.compiler.truffle.PostPartialEvaluationSuite;
 import jdk.graal.compiler.truffle.TruffleCompilerOptions;
 import jdk.graal.compiler.truffle.TruffleInliningScope;
@@ -52,11 +51,9 @@ public final class AgnosticInliningPhase extends BasePhase<TruffleTierContext> {
         POLICY_PROVIDERS = providers;
     }
 
-    private final PartialEvaluator partialEvaluator;
     private final PostPartialEvaluationSuite postPartialEvaluationSuite;
 
-    public AgnosticInliningPhase(PartialEvaluator partialEvaluator, PostPartialEvaluationSuite postPartialEvaluationSuite) {
-        this.partialEvaluator = partialEvaluator;
+    public AgnosticInliningPhase(PostPartialEvaluationSuite postPartialEvaluationSuite) {
         this.postPartialEvaluationSuite = postPartialEvaluationSuite;
     }
 
@@ -78,7 +75,7 @@ private static InliningPolicyProvider getInliningPolicyProvider(TruffleTierConte
     @Override
     protected void run(StructuredGraph graph, TruffleTierContext context) {
         final InliningPolicy policy = getInliningPolicyProvider(context).get(context.compilerOptions, context);
-        final CallTree tree = new CallTree(partialEvaluator, postPartialEvaluationSuite, context, policy);
+        final CallTree tree = new CallTree(postPartialEvaluationSuite, context, policy);
         TruffleInliningScope scope = TruffleInliningScope.getCurrent(context.debug);
         if (scope != null) {
             scope.setCallTree(tree);

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

@@ -26,7 +26,6 @@
 
 import jdk.graal.compiler.debug.DebugContext;
 import jdk.graal.compiler.graph.Graph;
-import jdk.graal.compiler.truffle.PartialEvaluator;
 import jdk.graal.compiler.truffle.PostPartialEvaluationSuite;
 import jdk.graal.compiler.truffle.TruffleCompilerOptions;
 import jdk.graal.compiler.truffle.TruffleTierContext;
@@ -46,11 +45,11 @@ public final class CallTree extends Graph {
     int frontierSize;
     private int nextId = 0;
 
-    CallTree(PartialEvaluator partialEvaluator, PostPartialEvaluationSuite postPartialEvaluationSuite, TruffleTierContext context, InliningPolicy policy) {
+    CallTree(PostPartialEvaluationSuite postPartialEvaluationSuite, TruffleTierContext context, InliningPolicy policy) {
         super(context.graph.getOptions(), context.debug);
         this.policy = policy;
         this.context = context;
-        this.graphManager = new GraphManager(partialEvaluator, postPartialEvaluationSuite, context);
+        this.graphManager = new GraphManager(postPartialEvaluationSuite, context);
         this.useSize = TruffleCompilerOptions.InliningUseSize.getValue(context.compilerOptions);
         // Should be kept as the last call in the constructor, as this is an argument.
         this.root = CallNode.makeRoot(context, this);

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

@@ -64,8 +64,8 @@ final class GraphManager {
     private final PostPartialEvaluationSuite postPartialEvaluationSuite;
     private final boolean useSize;
 
-    GraphManager(PartialEvaluator partialEvaluator, PostPartialEvaluationSuite postPartialEvaluationSuite, TruffleTierContext rootContext) {
-        this.partialEvaluator = partialEvaluator;
+    GraphManager(PostPartialEvaluationSuite postPartialEvaluationSuite, TruffleTierContext rootContext) {
+        this.partialEvaluator = rootContext.partialEvaluator;
         this.postPartialEvaluationSuite = postPartialEvaluationSuite;
         this.rootContext = rootContext;
         this.graphCacheForInlining = partialEvaluator.getOrCreateEncodedGraphCache();

substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateTruffleCompilerImpl.java

@@ -85,7 +85,7 @@ public void initialize(TruffleCompilable compilable, boolean firstInitialization
 
     @Override
     protected TruffleTier newTruffleTier(OptionValues options) {
-        return new TruffleTier(options, partialEvaluator,
+        return new TruffleTier(options,
                         new InstrumentationSuite(partialEvaluator.instrumentationCfg, partialEvaluator.getInstrumentation()),
                         new SubstratePostPartialEvaluationSuite(getGraalOptions(), TruffleCompilerOptions.IterativePartialEscape.getValue(options)));
     }