Move Syncs out of the way before removing a block.

[libfirm] / ir / be / beirgmod.c

diff --git a/ir/be/beirgmod.c b/ir/be/beirgmod.c
index e551255..cfcbac6 100644 (file)
--- a/ir/be/beirgmod.c
+++ b/ir/be/beirgmod.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -198,12 +198,21 @@ static void remove_empty_block(ir_node *block)
 
                if(node == jump)
                        continue;
-               if(is_Pin(node)) {
+               if (is_Block(node)) {
+                       /* a Block->Block edge: This should be the MacroBlock
+                          edge, ignore it. */
+                       assert(get_Block_MacroBlock(node) == block && "Wrong Block->Block edge");
+                       continue;
+               }
+               if (is_Pin(node)) {
                        set_nodes_block(node, succ_block);
                        continue;
                }
-               panic("Unexpected node %+F in block %+F with empty schedule", node,
-                     block);
+               if (is_Sync(node)) {
+                       set_nodes_block(node, get_nodes_block(pred));
+                       continue;
+               }
+               panic("Unexpected node %+F in block %+F with empty schedule", node, block);
        }
 
        set_Block_cfgpred(block, 0, new_Bad());
@@ -230,7 +239,7 @@ int be_remove_empty_blocks(ir_graph *irg)
 
        blocks_removed = 0;
 
-       set_using_visited(irg);
+       set_using_irn_visited(irg);
        inc_irg_visited(irg);
        remove_empty_block(get_irg_end_block(irg));
        end   = get_irg_end(irg);
@@ -241,7 +250,7 @@ int be_remove_empty_blocks(ir_graph *irg)
                        continue;
                remove_empty_block(pred);
        }
-       clear_using_visited(irg);
+       clear_using_irn_visited(irg);
 
        if (blocks_removed) {
                /* invalidate analysis info */