Treat conversions between the same size as downconv to get rid of unnecessary convers...

[libfirm] / ir / opt / proc_cloning.c

diff --git a/ir/opt/proc_cloning.c b/ir/opt/proc_cloning.c
index 322428a..6c4b451 100644 (file)
--- a/ir/opt/proc_cloning.c
+++ b/ir/opt/proc_cloning.c
@@ -50,7 +50,7 @@
 #include "irnode_t.h"
 #include "irtools.h"
 #include "irgmod.h"
-#include "array.h"
+#include "array_t.h"
 #include "xmalloc.h"
 
 /**
@@ -193,6 +193,10 @@ static void collect_irg_calls(ir_node *call, void *env) {
                if (get_entity_visibility(callee) == visibility_external_allocated)
                        return;
 
+               /* we cannot clone calls to weak functions */
+               if (get_entity_additional_properties(callee) & mtp_property_weak)
+                       return;
+
                process_call(call, callee, hmap);
        }
 }
@@ -274,7 +278,7 @@ static void set_preds(ir_node *irn, void *env) {
        } else {
                /* First we set the block our copy if it is not a block.*/
                set_nodes_block(irn_copy, get_irn_link(get_nodes_block(irn)));
-               if (get_irn_op(irn) == op_End) {
+               if (is_End(irn)) {
                        /* Handle the keep-alives. This must be done separately, because
                           the End node was NOT copied */
                        for (i = 0; i < get_End_n_keepalives(irn); ++i)
@@ -311,7 +315,7 @@ static ir_node *get_irg_arg(ir_graph *irg, int pos) {
                                 * We rely on the fact the only one arg exists, so do
                                 * a cheap CSE in this case.
                                 */
-                               set_irn_out(irg_args, i, arg);
+                               set_irn_out(irg_args, i, arg, 0);
                                exchange(proj, arg);
                        } else
                                arg = proj;
@@ -533,7 +537,7 @@ restart:
 
                /* we know, that a SymConst is here */
                ptr = get_Call_ptr(call);
-               assert(get_irn_op(ptr) == op_SymConst);
+               assert(is_SymConst(ptr));
 
                callee = get_SymConst_entity(ptr);
                if (callee != entry->q.ent) {