X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fproc_cloning.c;h=1c3cf881fe70f62180d2b5a510d9fde938e0739d;hb=4b734653b3f11a3182963369bb58980e4d5a62cb;hp=0e9f492d9203aeaf426bbe3f99f29f8405a37f77;hpb=6aac59aee3a4d2c1ec050af2b9a2ac12ded488f7;p=libfirm

diff --git a/ir/opt/proc_cloning.c b/ir/opt/proc_cloning.c
index 0e9f492d9..1c3cf881f 100644
--- a/ir/opt/proc_cloning.c
+++ b/ir/opt/proc_cloning.c
@@ -31,9 +31,7 @@
  * aren't be constant. The constant parameters of the function are placed
  * in the function graph. They aren't be passed as parameters.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <string.h>
 
@@ -50,8 +48,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 +190,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);
 	}
 }
@@ -211,7 +212,7 @@ static ident *get_clone_ident(ident *id, int pos, unsigned nr) {
 
 	snprintf(clone_postfix, sizeof(clone_postfix), "_cl_%d_%u", pos, nr);
 
-	return mangle(id, new_id_from_str(clone_postfix));
+	return id_mangle(id, new_id_from_str(clone_postfix));
 }
 
 /**
@@ -274,7 +275,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)
@@ -340,7 +341,7 @@ static void create_clone_proc_irg(ir_entity *ent, quadruple_t *q) {
 	arg        = get_irg_arg(get_entity_irg(q->ent), q->pos);
 	/* we will replace the argument in position "q->pos" by this constant. */
 	const_arg  = new_r_Const_type(
-		clone_irg, get_nodes_block(arg), get_irn_mode(arg), q->tv,
+		clone_irg, q->tv,
 		get_method_param_type(get_entity_type(q->ent), q->pos));
 
 	/* args copy in the cloned graph will be the const. */
@@ -533,7 +534,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) {