From d397dbcd99452ed440e1a99495436af91513a5ac Mon Sep 17 00:00:00 2001 From: Diego Novillo Date: Thu, 29 Jul 2004 17:15:38 +0000 Subject: [PATCH] tree-ssa-operands.c (get_expr_operands): Revert changes to ADDR_EXPR processing introduced by... * tree-ssa-operands.c (get_expr_operands): Revert changes to ADDR_EXPR processing introduced by: 2004-06-21 Richard Kenner * tree-ssa-operands.c (get_expr_operands): Minor rearrangements. testsuite/ChangeLog * gcc.dg/tree-ssa/20040729-1.c: New test. From-SVN: r85306 --- gcc/ChangeLog | 7 +++++++ gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/gcc.dg/tree-ssa/20040729-1.c | 18 ++++++++++++++++++ gcc/tree-ssa-operands.c | 6 +++--- 4 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/20040729-1.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 22fa1084949..1d178751163 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2004-07-29 Diego Novillo + + * tree-ssa-operands.c (get_expr_operands): Revert changes + to ADDR_EXPR processing introduced by: + 2004-06-21 Richard Kenner + * tree-ssa-operands.c (get_expr_operands): Minor rearrangements. + 2004-07-29 Joseph S. Myers * doc/implement-c.texi: Add C90 subclause references. Point to diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 2bb525981ec..c82cbe55ddc 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2004-07-29 Diego Novillo + + * gcc.dg/tree-ssa/20040729-1.c: New test. + 2004-07-27 Matt Austern * gcc.dg/darwin-bool-1.c: New test. diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20040729-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20040729-1.c new file mode 100644 index 00000000000..6543163e609 --- /dev/null +++ b/gcc/testsuite/gcc.dg/tree-ssa/20040729-1.c @@ -0,0 +1,18 @@ +/* { dg-do compile } */ +/* { dg-options "-O1 -fdump-tree-dce3" } */ + +foo () +{ + volatile int *p; + volatile int x; + + p = &x; + *p = 3; + return *p + 1; +} + +/* The assignment to 'p' is dead and should be removed. But the + compiler was mistakenly thinking that the statement had volatile + operands. But 'p' itself is not volatile and taking the address of + a volatile does not constitute a volatile operand. */ +/* { dg-final { scan-tree-dump-times "&x" 0 "dce3"} } */ diff --git a/gcc/tree-ssa-operands.c b/gcc/tree-ssa-operands.c index a9e864ed8c1..4b1e37f2b3f 100644 --- a/gcc/tree-ssa-operands.c +++ b/gcc/tree-ssa-operands.c @@ -859,9 +859,9 @@ get_expr_operands (tree stmt, tree *expr_p, int flags, voperands_t prev_vops) of interest to some passes (e.g. alias resolution). */ add_stmt_operand (expr_p, stmt, 0, NULL); - /* If the address is constant (invariant is not sufficient), there will - be no interesting variable references inside. */ - if (TREE_CONSTANT (expr)) + /* If the address is invariant, there may be no interesting variable + references inside. */ + if (is_gimple_min_invariant (expr)) return; /* There should be no VUSEs created, since the referenced objects are -- 2.30.2