Do not pass the speculationLog into the TruffleTierContext.

jerboaa · Mar 14, 2022 · 7ac7747 · 7ac7747
1 parent 7d77e43
commit 7ac7747
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/...piler.truffle.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleCompilerImpl.java b/...piler.truffle.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleCompilerImpl.java
@@ -541,17 +541,11 @@ private void compileAST(TruffleCompilationWrapper wrapper, DebugContext debug) {
 
     @SuppressWarnings("try")
     private StructuredGraph truffleTier(TruffleCompilationWrapper wrapper, DebugContext debug) {
-        SpeculationLog speculationLog = wrapper.compilable.getCompilationSpeculationLog();
-        if (speculationLog != null) {
-            speculationLog.collectFailedSpeculations();
-        }
         StructuredGraph graph;
         try (DebugCloseable a = PartialEvaluationTime.start(debug);
                         DebugCloseable c = PartialEvaluationMemUse.start(debug);
                         PerformanceInformationHandler handler = PerformanceInformationHandler.install(wrapper.options)) {
-            // SpeculationLog can be read from wrapper.compilable, but I'm not sure of the machinery
-            // around it
-            TruffleTierContext context = new TruffleTierContext(partialEvaluator, wrapper, debug, speculationLog, handler);
+            TruffleTierContext context = new TruffleTierContext(partialEvaluator, wrapper, debug, handler);
             try (Scope s = context.debug.scope("CreateGraph", context.graph);
                             Indent indent = context.debug.logAndIndent("evaluate %s", context.graph);) {
                 truffleTier.apply(context.graph, context);

diff --git a/...mpiler.truffle.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleTierContext.java b/...mpiler.truffle.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleTierContext.java
@@ -78,12 +78,19 @@ public TruffleTierContext(PartialEvaluator partialEvaluator, OptionValues option
         this.handler = handler;
     }
 
-    public TruffleTierContext(PartialEvaluator partialEvaluator, TruffleCompilerImpl.TruffleCompilationWrapper wrapper, DebugContext debug, SpeculationLog speculationLog,
-                    PerformanceInformationHandler handler) {
-        this(partialEvaluator, wrapper.options, debug, wrapper.compilable, partialEvaluator.rootForCallTarget(wrapper.compilable), wrapper.compilationId, speculationLog, wrapper.task, handler);
+    public TruffleTierContext(PartialEvaluator partialEvaluator, TruffleCompilerImpl.TruffleCompilationWrapper wrapper, DebugContext debug, PerformanceInformationHandler handler) {
+        this(partialEvaluator, wrapper.options, debug, wrapper.compilable, partialEvaluator.rootForCallTarget(wrapper.compilable), wrapper.compilationId, getSpeculationLog(wrapper), wrapper.task, handler);
     }
 
     public boolean isFirstTier() {
         return task.isFirstTier();
     }
+
+    private static SpeculationLog getSpeculationLog(TruffleCompilerImpl.TruffleCompilationWrapper wrapper) {
+        SpeculationLog speculationLog = wrapper.compilable.getCompilationSpeculationLog();
+        if (speculationLog != null) {
+            speculationLog.collectFailedSpeculations();
+        }
+        return speculationLog;
+    }
 }