X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fproc_cloning.c;h=41808b49777a3ee6574765d8118cb4d013b0871b;hb=44faeb9742640d3498eb4482f98eb1255607c4d6;hp=3bb04580eab6a5253419d6f01f299d565b4d706c;hpb=6c40be037a39b3150d51eeb37237a840d6bd177e;p=libfirm

diff --git a/ir/opt/proc_cloning.c b/ir/opt/proc_cloning.c
index 3bb04580e..41808b497 100644
--- a/ir/opt/proc_cloning.c
+++ b/ir/opt/proc_cloning.c
@@ -53,9 +53,6 @@
 #include "array.h"
 #include "xmalloc.h"
 
-/* A macro to iterate sets.*/
-#define ITERATE_SET(set_entries, entry) for(entry = set_first(set_entries); entry; entry = set_next(set_entries))
-
 /**
  * This struct contains the information quadruple for a Call, which we need to
  * decide if this function must be cloned.
@@ -187,15 +184,19 @@ static void collect_irg_calls(ir_node *call, void *env) {
 	if (is_Call(call)) {
 		call_ptr = get_Call_ptr(call);
 
-		if (! is_SymConst_addr_ent(call_ptr))
+		if (! is_Global(call_ptr))
 			return;
 
-		callee = get_SymConst_entity(call_ptr);
+		callee = get_Global_entity(call_ptr);
 
 		/* we can only clone calls to existing entities */
 		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);
 	}
 }
@@ -265,7 +266,7 @@ static void set_preds(ir_node *irn, void *env) {
 	irn_copy  = get_irn_link(irn);
 
 	if (is_Block(irn)) {
-		set_Block_MacroBlock(irn_copy, get_irn_link(get_Block_MacroBlock(irn)))
+		set_Block_MacroBlock(irn_copy, get_irn_link(get_Block_MacroBlock(irn)));
 		for (i = get_Block_n_cfgpreds(irn) - 1; i >= 0; i--) {
 			pred = get_Block_cfgpred(irn, i);
 			/* "End" block must be handled extra, because it is not matured.*/
@@ -277,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)
@@ -314,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;
@@ -509,7 +510,7 @@ static void exchange_calls(quadruple_t *q, ir_entity *cloned_ent) {
  */
 static float calculate_weight(const entry_t *entry) {
 	return ARR_LEN(entry->q.calls) *
-		(get_method_param_weight(entry->q.ent, entry->q.pos) + 1);
+		(float)(get_method_param_weight(entry->q.ent, entry->q.pos) + 1);
 }
 
 /**
@@ -536,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) {