# HG changeset patch
# User Gilles Duboscq <duboscq@ssw.jku.at>
# Date 1329413071 -3600
# Node ID 2ab543f06630c524edb77e5e55936c6bb6afb1b1
# Parent  bd8aca42516f6e25ddb694b40726e4eaa1fdc9d5
Fix merge

diff -r bd8aca42516f -r 2ab543f06630 graal/com.oracle.max.graal.lir/src/com/oracle/max/graal/lir/cfg/Block.java
--- 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.*;
diff -r bd8aca42516f -r 2ab543f06630 graal/com.oracle.max.graal.nodes/src/com/oracle/max/graal/nodes/StructuredGraph.java
--- 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) {