Update assert.

wincc0823 · Sep 11, 2020 · 98c1eb3 · 98c1eb3
1 parent 47501c2
commit 98c1eb3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/....compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/InliningUtil.java b/....compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/InliningUtil.java
@@ -502,7 +502,7 @@ public static EconomicSet<Node> inlineForCanonicalization(Invoke invoke, Structu
     @SuppressWarnings("try")
     public static EconomicSet<Node> inlineForCanonicalization(Invoke invoke, StructuredGraph inlineGraph, boolean receiverNullCheck, ResolvedJavaMethod inlineeMethod,
                     Consumer<UnmodifiableEconomicMap<Node, Node>> duplicatesConsumer, String reason, String phase) {
-        assert invoke.asNode().graph().getSpeculationLog() == inlineGraph.getSpeculationLog();
+        assert inlineGraph.isSubstitution() || invoke.asNode().graph().getSpeculationLog() == inlineGraph.getSpeculationLog();
         EconomicSetNodeEventListener listener = new EconomicSetNodeEventListener();
         /*
          * This code relies on the fact that Graph.addDuplicates doesn't trigger the

diff --git a/...ses.common/src/org/graalvm/compiler/phases/common/inlining/info/elem/InlineableGraph.java b/...ses.common/src/org/graalvm/compiler/phases/common/inlining/info/elem/InlineableGraph.java
@@ -191,8 +191,8 @@ private static ArrayList<Node> trackParameterUsages(ParameterNode param, ArrayLi
     @SuppressWarnings("try")
     private static StructuredGraph parseBytecodes(ResolvedJavaMethod method, HighTierContext context, CanonicalizerPhase canonicalizer, StructuredGraph caller, boolean trackNodeSourcePosition) {
         DebugContext debug = caller.getDebug();
-        StructuredGraph newGraph = new StructuredGraph.Builder(caller.getOptions(), debug, caller.allowAssumptions()).method(method).trackNodeSourcePosition(trackNodeSourcePosition)
-                        .useProfilingInfo(caller.useProfilingInfo()).speculationLog(caller.getSpeculationLog()).build();
+        StructuredGraph newGraph = new StructuredGraph.Builder(caller.getOptions(), debug, caller.allowAssumptions()).method(method).trackNodeSourcePosition(trackNodeSourcePosition).useProfilingInfo(
+                        caller.useProfilingInfo()).speculationLog(caller.getSpeculationLog()).build();
         try (DebugContext.Scope s = debug.scope("InlineGraph", newGraph)) {
             if (!caller.isUnsafeAccessTrackingEnabled()) {
                 newGraph.disableUnsafeAccessTracking();