Mercurial > hg > truffle

changeset 15384:7cddd549579a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
VirtualStates should not block MergeNode splitting
author Lukas Stadler <lukas.stadler@oracle.com>
date Fri, 25 Apr 2014 11:27:11 +0200
parents b14d85af515f
children 63aad7e1c867
files graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/MergeNode.java
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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;
                 }
             }