Mercurial > hg > truffle

changeset 4621:2ab543f06630

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Thu, 16 Feb 2012 18:24:31 +0100
parents bd8aca42516f
children 00e01f401c03
files graal/com.oracle.max.graal.lir/src/com/oracle/max/graal/lir/cfg/Block.java graal/com.oracle.max.graal.nodes/src/com/oracle/max/graal/nodes/StructuredGraph.java
diffstat 2 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.max.graal.lir/src/com/oracle/max/graal/lir/cfg/Block.java	Thu Feb 16 17:47:43 2012 +0100
+++ b/graal/com.oracle.max.graal.lir/src/com/oracle/max/graal/lir/cfg/Block.java	Thu Feb 16 18:24:31 2012 +0100
@@ -24,7 +24,6 @@
 
 import java.util.*;
 
-import com.oracle.max.graal.debug.*;
 import com.oracle.max.graal.graph.*;
 import com.oracle.max.graal.lir.*;
 import com.oracle.max.graal.nodes.*;
--- a/graal/com.oracle.max.graal.nodes/src/com/oracle/max/graal/nodes/StructuredGraph.java	Thu Feb 16 17:47:43 2012 +0100
+++ b/graal/com.oracle.max.graal.nodes/src/com/oracle/max/graal/nodes/StructuredGraph.java	Thu Feb 16 18:24:31 2012 +0100
@@ -202,6 +202,7 @@
         }
         node.replaceAtPredecessors(next);
         node.safeDelete();
+        begin.safeDelete();
     }
 
     public void removeSplitPropagate(ControlSplitNode node, int survivingSuccessor) {