X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbespillbelady.c;h=08b9c64311f7889492f5a365a9c456564dc89f5e;hb=143561a3b47dd7cd6fbd1760d69f9299b64e9994;hp=19ab8a217e4c627be3c2db036321cf3a737fd50e;hpb=fc10fa34a44fc4a93e0c81f1290ab6606efe2d5c;p=libfirm

diff --git a/ir/be/bespillbelady.c b/ir/be/bespillbelady.c
index 19ab8a217..08b9c6431 100644
--- a/ir/be/bespillbelady.c
+++ b/ir/be/bespillbelady.c
@@ -20,6 +20,7 @@
 #include "obst.h"
 #include "set.h"
 #include "pset.h"
+#include "irprintf_t.h"
 #include "irgraph.h"
 #include "irnode.h"
 #include "irmode.h"
@@ -256,10 +257,12 @@ static int is_mem_phi(const ir_node *irn, void *data) {
 static INLINE unsigned get_distance(belady_env_t *bel, const ir_node *from, unsigned from_step, const ir_node *def, int skip_from_uses)
 {
 	arch_irn_flags_t fl = arch_irn_get_flags(bel->arch, def);
-	if((fl & (arch_irn_flags_ignore | arch_irn_flags_dont_spill)) != 0)
+	unsigned dist = be_get_next_use(bel->uses, from, from_step, def, skip_from_uses);
+
+	if(!USES_IS_INIFINITE(dist) && (fl & (arch_irn_flags_ignore | arch_irn_flags_dont_spill)) != 0)
 		return 0;
-	else
-		return be_get_next_use(bel->uses, from, from_step, def, skip_from_uses);
+
+	return dist;
 }
 
 /**
@@ -587,16 +590,15 @@ static void remove_copies(belady_env_t *bel) {
 	ir_node *irn;
 
 	for (irn = pset_first(bel->copies); irn; irn = pset_next(bel->copies)) {
-		ir_node *src, *spill;
+		ir_node *src, *user;
 
 		assert(be_is_Copy(irn));
 		assert(get_irn_n_edges(irn) == 1 && "This is not a copy introduced in 'compute_block_start_info()'. Who created it?");
 
-		spill = get_irn_edge(get_irn_irg(irn), irn, 0)->src;
-		assert(be_is_Spill(spill) && "This is not a copy introduced in 'compute_block_start_info()'. Who created it?");
+		user = get_irn_edge(get_irn_irg(irn), irn, 0)->src;
 
-		src = get_irn_n(irn, 0);
-		set_irn_n(spill, 0, src);
+		src = get_irn_n(irn, be_pos_Copy_orig);
+		set_irn_n(user, 0, src);
 	}
 }
 
@@ -612,7 +614,7 @@ static void remove_unused_reloads(ir_graph *irg, belady_env_t *bel) {
 		ir_node *spill;
 		DBG((dbg, DBG_SPILL, "Removing %+F before %+F in %+F\n", irn, sched_next(irn), get_nodes_block(irn)));
 
-		spill = get_irn_n(irn, 0);
+		spill = get_irn_n(irn, be_pos_Reload_mem);
 
 		/* remove reload */
 		set_irn_n(irn, 0, new_Bad());