X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fproc_cloning.c;h=c011e57cfad61427d9ce7bf21c0d59e41c4572ed;hb=0cc8bfc863da28d3799e9eca1d1765d564b6e573;hp=322428ad823932ef9b138812fc16659daef6493e;hpb=341e4e672094e29e2552f375540e90d60030602b;p=libfirm

diff --git a/ir/opt/proc_cloning.c b/ir/opt/proc_cloning.c
index 322428ad8..c011e57cf 100644
--- a/ir/opt/proc_cloning.c
+++ b/ir/opt/proc_cloning.c
@@ -50,8 +50,7 @@
 #include "irnode_t.h"
 #include "irtools.h"
 #include "irgmod.h"
-#include "array.h"
-#include "xmalloc.h"
+#include "array_t.h"
 
 /**
  * This struct contains the information quadruple for a Call, which we need to
@@ -193,6 +192,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 +277,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 +314,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 +536,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) {