becopyheur4: Clean up co_mst_irn_init().

[libfirm] / ir / opt / ifconv.c

diff --git a/ir/opt/ifconv.c b/ir/opt/ifconv.c
index 7e5194b..327465a 100644 (file)
--- a/ir/opt/ifconv.c
+++ b/ir/opt/ifconv.c
@@ -1,24 +1,10 @@
 /*
- * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
- *
  * This file is part of libFirm.
- *
- * This file may be distributed and/or modified under the terms of the
- * GNU General Public License version 2 as published by the Free Software
- * Foundation and appearing in the file LICENSE.GPL included in the
- * packaging of this file.
- *
- * Licensees holding valid libFirm Professional Edition licenses may use
- * this file in accordance with the libFirm Commercial License.
- * Agreement provided with the Software.
- *
- * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
- * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE.
+ * Copyright (C) 2012 University of Karlsruhe.
  */
 
-/*
- * @file    ir/opt/ifconv.c
+/**
+ * @file
  * @brief   If conversion
  * @author  Christoph Mallon
  */
@@ -398,24 +384,11 @@ restart:
 
                                if (arity == 2) {
                                        unsigned mark;
-#if 0
-                                       DB((dbg, LEVEL_1,  "Welding block %+F and %+F\n", block, mux_block));
-                                       /* copy the block-info from the Mux-block to the block before merging */
-
-                                       mark =  get_Block_mark(mux_block) | get_Block_mark(block);
-                                       set_Block_mark(block, mark);
-                                       set_Block_phis(block, get_Block_phis(mux_block));
-
-                                       set_irn_in(block, get_irn_arity(mux_block), get_irn_in(mux_block) + 1);
-                                       exchange_cdep(mux_block, block);
-                                       exchange(mux_block, block);
-#else
                                        DB((dbg, LEVEL_1,  "Welding block %+F to %+F\n", block, mux_block));
                                        mark =  get_Block_mark(mux_block) | get_Block_mark(block);
                                        /* mark both block just to be sure, should be enough to mark mux_block */
                                        set_Block_mark(mux_block, mark);
                                        exchange(block, mux_block);
-#endif
                                        return;
                                } else {
                                        rewire(block, i, j, new_r_Jmp(mux_block));