Ignore FrameState when matching nodes

wincc0823 · Sep 11, 2020 · 71f81c0 · 71f81c0
1 parent 49d041c
commit 71f81c0
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/compiler/src/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/MatchContext.java b/compiler/src/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/MatchContext.java
@@ -45,6 +45,7 @@
 import org.graalvm.compiler.graph.NodeMap;
 import org.graalvm.compiler.nodes.PhiNode;
 import org.graalvm.compiler.nodes.StructuredGraph;
+import org.graalvm.compiler.nodes.VirtualState;
 import org.graalvm.compiler.nodes.calc.FloatingNode;
 import org.graalvm.compiler.nodes.cfg.Block;
 import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
@@ -242,7 +243,7 @@ private Result findEarlyPosition() {
     private static boolean sideEffectFree(Node node) {
         // The order of evaluation of these nodes controlled by data dependence so they
         // don't interfere with this match.
-        return node instanceof VirtualObjectNode || node instanceof FloatingNode;
+        return node instanceof VirtualObjectNode || node instanceof FloatingNode || node instanceof VirtualState;
     }
 
     private void findLatePosition() {