From 85b7dda1f704cb33434c0b91961474c340da4f4b Mon Sep 17 00:00:00 2001 From: Michael Beck Date: Wed, 7 Apr 2010 06:45:26 +0000 Subject: [PATCH] C99 feature removed. [r27352] --- ir/ana/vrp.c | 4 ++-- ir/opt/convopt.c | 4 +++- ir/opt/loop.c | 3 +-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ir/ana/vrp.c b/ir/ana/vrp.c index 38d4737d8..d541609e8 100644 --- a/ir/ana/vrp.c +++ b/ir/ana/vrp.c @@ -619,14 +619,14 @@ vrp_attr *vrp_get_info(const ir_node *node) { const ir_graph *irg = get_irn_irg(node); const ir_phase *phase = irg_get_phase(irg, PHASE_VRP); + vrp_attr *vrp; if (phase == NULL) { /* phase has not yet been initialized */ return NULL; } - - vrp_attr *vrp = phase_get_irn_data(phase, node); + vrp = phase_get_irn_data(phase, node); if (vrp && vrp->valid) { return vrp; } diff --git a/ir/opt/convopt.c b/ir/opt/convopt.c index 4787c3f12..eb59084f9 100644 --- a/ir/opt/convopt.c +++ b/ir/opt/convopt.c @@ -284,8 +284,10 @@ static void conv_opt_walker(ir_node *node, void *data) transformed = conv_transform(pred, mode); if (node != transformed) { + vrp_attr *vrp; + exchange(node, transformed); - vrp_attr *vrp = vrp_get_info(transformed); + vrp = vrp_get_info(transformed); if (vrp && vrp->valid) { vrp->range_type = VRP_VARYING; vrp->bits_set = tarval_convert_to(vrp->bits_set, mode); diff --git a/ir/opt/loop.c b/ir/opt/loop.c index 1953d3785..e3fcd3bea 100644 --- a/ir/opt/loop.c +++ b/ir/opt/loop.c @@ -768,11 +768,10 @@ static void construct_ssa(ir_node *orig_block, ir_node *orig_val, */ static ir_node *construct_ssa_n(ir_node *def, ir_node *user, int copies) { - ir_graph *irg; ir_mode *mode; - irg = get_irn_irg(def); int i, user_arity; ir_node *newval; + ir_graph *irg = get_irn_irg(def); ir_reserve_resources(irg, IR_RESOURCE_IRN_VISITED); inc_irg_visited(current_ir_graph); -- 2.20.1