From c46d001a91568c9fd19ee74c73d34f87ebd4aef5 Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Mon, 9 May 2011 11:29:26 +0000 Subject: [PATCH] var-tracking.c (find_mem_expr_in_1pdv): Fix thinko. * var-tracking.c (find_mem_expr_in_1pdv): Fix thinko. (dataflow_set_preserve_mem_locs): Likewise. From-SVN: r173565 --- gcc/ChangeLog | 8 +++++++- gcc/var-tracking.c | 12 ++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e0d739f2cc0..de400532ab0 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,4 +1,10 @@ -2011-05-04 Philipp Thomas +2011-05-09 Eric Botcazou + + * var-tracking.c (find_mem_expr_in_1pdv): Fix thinko. + (dataflow_set_preserve_mem_locs): Likewise. + +2011-05-09 Philipp Thomas + * config/mep/mep.c (mep_validate_vliw): Syntax description should not be translated. diff --git a/gcc/var-tracking.c b/gcc/var-tracking.c index 3e5855e3a2d..90411123a69 100644 --- a/gcc/var-tracking.c +++ b/gcc/var-tracking.c @@ -4113,8 +4113,9 @@ find_mem_expr_in_1pdv (tree expr, rtx val, htab_t vars) VALUE_RECURSED_INTO (val) = true; for (node = var->var_part[0].loc_chain; node; node = node->next) - if (MEM_P (node->loc) && MEM_EXPR (node->loc) == expr - && MEM_OFFSET (node->loc) == 0) + if (MEM_P (node->loc) + && MEM_EXPR (node->loc) == expr + && INT_MEM_OFFSET (node->loc) == 0) { where = node; break; @@ -4177,11 +4178,10 @@ dataflow_set_preserve_mem_locs (void **slot, void *data) { for (loc = var->var_part[0].loc_chain; loc; loc = loc->next) { - /* We want to remove dying MEMs that doesn't refer to - DECL. */ + /* We want to remove dying MEMs that doesn't refer to DECL. */ if (GET_CODE (loc->loc) == MEM && (MEM_EXPR (loc->loc) != decl - || MEM_OFFSET (loc->loc)) + || INT_MEM_OFFSET (loc->loc) != 0) && !mem_dies_at_call (loc->loc)) break; /* We want to move here MEMs that do refer to DECL. */ @@ -4225,7 +4225,7 @@ dataflow_set_preserve_mem_locs (void **slot, void *data) if (GET_CODE (loc->loc) != MEM || (MEM_EXPR (loc->loc) == decl - && MEM_OFFSET (loc->loc) == 0) + && INT_MEM_OFFSET (loc->loc) == 0) || !mem_dies_at_call (loc->loc)) { if (old_loc != loc->loc && emit_notes) -- 2.30.2