From 883aa8413813772449233d98b7faeaafe76f9534 Mon Sep 17 00:00:00 2001 From: Matthias Braun Date: Mon, 29 Oct 2007 20:20:15 +0000 Subject: [PATCH] fix bugs when exchanging nodes to projs in bepeephole [r16391] --- ir/be/bepeephole.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/ir/be/bepeephole.c b/ir/be/bepeephole.c index afb7d018f..896e4a923 100644 --- a/ir/be/bepeephole.c +++ b/ir/be/bepeephole.c @@ -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; -- 2.20.1