Mercurial > hg > truffle

changeset 15444:be6685c6a831

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[flow-sensitive] readability
author Miguel Garcia <miguel.m.garcia@oracle.com>
date Tue, 29 Apr 2014 18:07:41 +0200
parents f5a837e3b65f
children bda013e0d8bb
files graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/FlowSensitiveReduction.java graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/State.java
diffstat 2 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/FlowSensitiveReduction.java	Tue Apr 29 18:01:09 2014 +0200
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/FlowSensitiveReduction.java	Tue Apr 29 18:07:41 2014 +0200
@@ -136,7 +136,7 @@
     }
 
     private static boolean isAliveWithoutUsages(FloatingNode node) {
-        return node.isAlive() && node.usages().isEmpty();
+        return node.isAlive() && FlowUtil.lacksUsages(node);
     }
 
     private void registerControlSplit(Node pred, BeginNode begin) {
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/State.java	Tue Apr 29 18:01:09 2014 +0200
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/State.java	Tue Apr 29 18:07:41 2014 +0200
@@ -275,9 +275,11 @@
             return true;
         }
 
-        for (State state : withReachableStates) {
-            versionNr = Math.max(versionNr, state.versionNr) + 1;
-            isUnreachable &= state.isUnreachable;
+        for (State other : withReachableStates) {
+            versionNr = Math.max(versionNr, other.versionNr) + 1;
+            if (!other.isUnreachable) {
+                isUnreachable = false;
+            }
         }
 
         if (isUnreachable) {