Mercurial > hg > truffle

diff graal/com.oracle.max.graal.nodes/src/com/oracle/max/graal/nodes/StructuredGraph.java @ 4619:a09b44a28e7f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
clenup unused floating nodes on killCFG CheckCast nodes can be anchored to any fixed node add an assert to scheduling
author Gilles Duboscq <duboscq@ssw.jku.at>
date Thu, 16 Feb 2012 17:47:14 +0100
parents a3882fd1ae61
children bd8aca42516f
line wrap: on
line diff
--- a/graal/com.oracle.max.graal.nodes/src/com/oracle/max/graal/nodes/StructuredGraph.java	Thu Feb 16 14:53:04 2012 +0100
+++ b/graal/com.oracle.max.graal.nodes/src/com/oracle/max/graal/nodes/StructuredGraph.java	Thu Feb 16 17:47:14 2012 +0100
@@ -201,7 +201,6 @@
         }
         node.replaceAtPredecessors(next);
         node.safeDelete();
-        begin.safeDelete();
     }
 
     public void removeSplitPropagate(ControlSplitNode node, int survivingSuccessor) {
@@ -286,7 +285,7 @@
     }
 
     public void reduceDegenerateLoopBegin(LoopBeginNode begin) {
-        assert begin.loopEnds().count() == 0 : "Loop begin still has backedges";
+        assert begin.loopEnds().isEmpty() : "Loop begin still has backedges";
         if (begin.forwardEndCount() == 1) { // bypass merge and remove
             reduceTrivialMerge(begin);
         } else { // convert to merge
@@ -297,7 +296,7 @@
 
     public void reduceTrivialMerge(MergeNode merge) {
         assert merge.forwardEndCount() == 1;
-        assert !(merge instanceof LoopBeginNode) || ((LoopBeginNode) merge).loopEnds().count() == 0;
+        assert !(merge instanceof LoopBeginNode) || ((LoopBeginNode) merge).loopEnds().isEmpty();
         for (PhiNode phi : merge.phis().snapshot()) {
             assert phi.valueCount() == 1;
             ValueNode singleValue = phi.valueAt(0);
@@ -308,7 +307,7 @@
         FixedNode sux = merge.next();
         FrameState stateAfter = merge.stateAfter();
         merge.safeDelete();
-        if (stateAfter != null && stateAfter.usages().count() == 0) {
+        if (stateAfter != null && stateAfter.usages().isEmpty()) {
             stateAfter.safeDelete();
         }
         if (sux == null) {