X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fcfopt.c;h=0f0fd84292359b156b94678c1cd3d583529c04b4;hb=6a6c1557afcd038930e649e29d69cb85a5dc372b;hp=80fdee5a2fb6cf3baa668ee367e5e1741c142fd1;hpb=1c9ba1bcb423f081cb177c3bf99958de5476e98f;p=libfirm

diff --git a/ir/opt/cfopt.c b/ir/opt/cfopt.c
index 80fdee5a2..0f0fd8429 100644
--- a/ir/opt/cfopt.c
+++ b/ir/opt/cfopt.c
@@ -46,6 +46,37 @@
 /* semantics of Phi nodes.                                          */
 /*------------------------------------------------------------------*/
 
+
+static void remove_senseless_conds(ir_node *bl, void *data)
+{
+	int i, j;
+	int n = get_irn_arity(bl);
+
+	assert(is_Block(bl));
+
+	for(i = 0; i < n; ++i) {
+		ir_node *pred_i = get_irn_n(bl, i);
+		ir_node *cond_i = skip_Proj(pred_i);
+
+		for(j = i + 1; j < n; ++j) {
+			ir_node *pred_j = get_irn_n(bl, j);
+			ir_node *cond_j = skip_Proj(pred_j);
+
+			if(cond_j == cond_i
+					&& get_irn_opcode(cond_i) == iro_Cond
+					&& get_irn_mode(get_Cond_selector(cond_i)) == mode_b) {
+
+				ir_node *jmp = new_r_Jmp(current_ir_graph, get_nodes_block(cond_i));
+				set_irn_n(bl, i, jmp);
+				set_irn_n(bl, j, new_Bad());
+
+				break;
+			}
+		}
+	}
+}
+
+
 /**
  * Removes Tuples from Block control flow predecessors.
  * Optimizes blocks with equivalent_node().  This is tricky,
@@ -545,6 +576,7 @@ void optimize_cf(ir_graph *irg) {
     }
   }
 
+  irg_block_walk_graph(current_ir_graph, NULL, remove_senseless_conds, NULL);
   /* Use block visited flag to mark non-empty blocks. */
   inc_irg_block_visited(irg);
   irg_walk(end, merge_blocks, collect_nodes, NULL);
@@ -577,6 +609,7 @@ void optimize_cf(ir_graph *irg) {
   /* DEL_ARR_F(end->in);   GL @@@ tut nicht ! */
   end->in = in;
 
+
   /* the verifyer doesn't work yet with floating nodes */
   if (get_irg_pinned(irg) == op_pin_state_pinned) {
     /* after optimize_cf(), only Bad data flow may remain. */