# HG changeset patch
# User Lukas Stadler <lukas.stadler@oracle.com>
# Date 1398418031 -7200
# Node ID 7cddd549579ae046311a54cf31fe75fbd3e27127
# Parent  b14d85af515f1edeb8d125aeb44649cac6a05655
VirtualStates should not block MergeNode splitting

diff -r b14d85af515f -r 7cddd549579a graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/MergeNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/MergeNode.java	Fri Apr 25 11:15:21 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/MergeNode.java	Fri Apr 25 11:27:11 2014 +0200
@@ -155,7 +155,7 @@
                 return;
             }
             for (PhiNode phi : phis()) {
-                if (phi.usages().filter(isNotA(FrameState.class)).and(node -> !merge.isPhiAtMerge(node)).isNotEmpty()) {
+                if (phi.usages().filter(isNotA(VirtualState.class)).and(node -> !merge.isPhiAtMerge(node)).isNotEmpty()) {
                     return;
                 }
             }