X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbepeephole.c;h=3d4c4ca1ac05bf893e712091380539266c12008c;hb=d300330b1e6df8c8914b8fb70cf38ee1c8ca2634;hp=afb7d018fb0c826e2f2cf8a68552d6f79b73b6a3;hpb=bce5f15071a9be1f7cdc5e66436dd54cb29900df;p=libfirm

diff --git a/ir/be/bepeephole.c b/ir/be/bepeephole.c
index afb7d018f..3d4c4ca1a 100644
--- a/ir/be/bepeephole.c
+++ b/ir/be/bepeephole.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.
  *
@@ -92,12 +92,6 @@ static void set_reg_value(ir_node *node)
 	reg_idx = arch_register_get_index(reg);
 	cls_idx = arch_register_class_index(cls);
 
-#ifdef DEBUG_libfirm
-	{
-		ir_node *old_value = register_values[cls_idx][reg_idx];
-		assert(old_value == NULL || old_value == node);
-	}
-#endif
 	DBG((dbg, LEVEL_1, "Set Register %s: %+F\n", reg->name, node));
 	register_values[cls_idx][reg_idx] = node;
 }
@@ -137,8 +131,13 @@ void be_peephole_before_exchange(const ir_node *old_node, ir_node *new_node)
 
 	DBG((dbg, LEVEL_1, "About to exchange %+F with %+F\n", old_node, new_node));
 
-	if(old_node == current_node)
-		current_node = new_node;
+	if(old_node == current_node) {
+		if(is_Proj(new_node)) {
+			current_node = get_Proj_pred(new_node);
+		} else {
+			current_node = new_node;
+		}
+	}
 
 	if(!mode_is_data(get_irn_mode(old_node)))
 		return;