X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fproc_cloning.c;h=41808b49777a3ee6574765d8118cb4d013b0871b;hb=0b437c919ef3a7c1b4e94c56685ff1580a63efd5;hp=7fc28389ea2959d2930d8d0b70ea9bb760dfed45;hpb=1ec30d95387eb392ba5a1adc7958ebd91383d59c;p=libfirm

diff --git a/ir/opt/proc_cloning.c b/ir/opt/proc_cloning.c
index 7fc28389e..41808b497 100644
--- a/ir/opt/proc_cloning.c
+++ b/ir/opt/proc_cloning.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -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,19 +184,19 @@ static void collect_irg_calls(ir_node *call, void *env) {
 	if (is_Call(call)) {
 		call_ptr = get_Call_ptr(call);
 
-		/* Call pointer must be a SymConst*/
-		if (op_SymConst != get_irn_op(call_ptr))
-			return;
-		/* Call pointer must be the address of an entity.*/
-		if (get_SymConst_kind(call_ptr) != symconst_addr_ent)
+		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);
 	}
 }
@@ -269,6 +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)));
 		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.*/
@@ -280,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)
@@ -317,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;
@@ -438,7 +436,7 @@ static ir_entity *clone_method(quadruple_t *q) {
 	sym.entity_p = new_entity;
 	rem = current_ir_graph;
 	current_ir_graph =  get_const_code_irg();
-	new_entity->value = new_SymConst(sym, symconst_addr_ent);
+	new_entity->value = new_SymConst(mode_P_code, sym, symconst_addr_ent);
 	current_ir_graph = rem;
 
 	/* The "new_entity" don't have this information. */
@@ -465,7 +463,7 @@ static ir_node *new_cl_Call(ir_node *call, ir_entity *new_entity, int pos) {
 	ir_node *bl = get_nodes_block(call);
 
 	sym.entity_p = new_entity;
-	callee = new_r_SymConst(irg, bl, sym, symconst_addr_ent);
+	callee = new_r_SymConst(irg, bl, mode_P_code, sym, symconst_addr_ent);
 
 	mtp      = get_entity_type(new_entity);
 	n_params = get_Call_n_params(call);
@@ -512,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);
 }
 
 /**
@@ -539,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) {