diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2011-01-21 13:57:52 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2011-01-21 13:57:52 +0100 |
| commit | 3a2df83199a98c7ff455fedb3c3ea27b95fca7ce (patch) | |
| tree | fb3ae648632a5de0ac53fcf258d6bd168323da84 | |
| parent | d8debb1d8a53c120ed56ef3753afa3e9acaccded (diff) | |
| download | gcc-3a2df83199a98c7ff455fedb3c3ea27b95fca7ce.zip gcc-3a2df83199a98c7ff455fedb3c3ea27b95fca7ce.tar.gz gcc-3a2df83199a98c7ff455fedb3c3ea27b95fca7ce.tar.bz2 | |
re PR tree-optimization/47391 (read from const volatile incorrectly eliminated)
PR tree-optimization/47391
* varpool.c (const_value_known_p): Return false if
decl is volatile.
* gcc.dg/pr47391.c: New test.
From-SVN: r169084
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/pr47391.c | 22 | ||||
| -rw-r--r-- | gcc/varpool.c | 4 |
4 files changed, 33 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index acb1eb7..edfc258 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -3,6 +3,10 @@ * tree-ssa-live.c (remove_unused_scope_block_p): Don't remove DECL_IGNORED_P non-reg vars if they are used. + PR tree-optimization/47391 + * varpool.c (const_value_known_p): Return false if + decl is volatile. + 2011-01-21 Kai Tietz <kai.tietz@onevision.com> PR bootstrap/47215 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 0b2d9e6..02b48bb 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-01-21 Jakub Jelinek <jakub@redhat.com> + + PR tree-optimization/47391 + * gcc.dg/pr47391.c: New test. + 2011-01-21 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> * g++.dg/template/char1.C: Use signed char. diff --git a/gcc/testsuite/gcc.dg/pr47391.c b/gcc/testsuite/gcc.dg/pr47391.c new file mode 100644 index 0000000..5ec98f1 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr47391.c @@ -0,0 +1,22 @@ +/* PR tree-optimization/47391 */ +/* { dg-do compile } */ +/* { dg-options "-O2 -fdump-tree-optimized" } */ + +const volatile int v = 1; +int i = 0; + +void +foo (void) +{ + i = v; +} + +int +main (void) +{ + foo (); + return 0; +} + +/* { dg-final { scan-tree-dump-not "i = 1;" "optimized" } } */ +/* { dg-final { cleanup-tree-dump "optimized" } } */ diff --git a/gcc/varpool.c b/gcc/varpool.c index d266ce9..2e37255 100644 --- a/gcc/varpool.c +++ b/gcc/varpool.c @@ -1,5 +1,5 @@ /* Callgraph handling code. - Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2010 + Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2010, 2011 Free Software Foundation, Inc. Contributed by Jan Hubicka @@ -370,7 +370,7 @@ const_value_known_p (tree decl) gcc_assert (TREE_CODE (decl) == VAR_DECL); - if (!TREE_READONLY (decl)) + if (!TREE_READONLY (decl) || TREE_THIS_VOLATILE (decl)) return false; /* Gimplifier takes away constructors of local vars */ |