diff options
| author | Martin Liska <mliska@suse.cz> | 2014-12-19 13:40:50 +0100 |
|---|---|---|
| committer | Martin Liska <marxin@gcc.gnu.org> | 2014-12-19 12:40:50 +0000 |
| commit | 6b0e0695a52d1a7f82b2adfe460c79254c361e14 (patch) | |
| tree | d45345d53057081d17513f486b39473450d4ffc4 | |
| parent | 1f8d3e84eee6918f3be3e12be67b250840750aeb (diff) | |
| download | gcc-6b0e0695a52d1a7f82b2adfe460c79254c361e14.zip gcc-6b0e0695a52d1a7f82b2adfe460c79254c361e14.tar.gz gcc-6b0e0695a52d1a7f82b2adfe460c79254c361e14.tar.bz2 | |
re PR ipa/63569 (Wrong code with volatile and ICF)
Fix for PR ipa/63569.
PR ipa/63569
* gcc.dg/ipa/pr63569.c: New test.
PR ipa/63569
* ipa-icf-gimple.c (func_checker::compare_operand): Add missing
comparison for volatile flag.
From-SVN: r218949
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/ipa-icf-gimple.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/ipa/pr63569.c | 32 |
4 files changed, 46 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d27e22e..19b33e7 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2014-12-19 Martin Liska <mliska@suse.cz> + + PR ipa/63569 + * ipa-icf-gimple.c (func_checker::compare_operand): Add missing + comparison for volatile flag. + 2014-12-19 Kyrylo Tkachov <kyrylo.tkachov@arm.com> * doc/invoke.texi (ARM options): Remove mention of Advanced RISC diff --git a/gcc/ipa-icf-gimple.c b/gcc/ipa-icf-gimple.c index ec0290a..fa2c353 100644 --- a/gcc/ipa-icf-gimple.c +++ b/gcc/ipa-icf-gimple.c @@ -230,6 +230,9 @@ func_checker::compare_operand (tree t1, tree t2) tree tt1 = TREE_TYPE (t1); tree tt2 = TREE_TYPE (t2); + if (TREE_THIS_VOLATILE (t1) != TREE_THIS_VOLATILE (t2)) + return return_false_with_msg ("different operand volatility"); + if (!func_checker::compatible_types_p (tt1, tt2)) return false; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 3501218..5ba1eff 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2014-12-19 Martin Liska <mliska@suse.cz> + + PR ipa/63569 + * gcc.dg/ipa/pr63569.c: New test. + 2014-12-19 Jakub Jelinek <jakub@redhat.com> PR preprocessor/63831 diff --git a/gcc/testsuite/gcc.dg/ipa/pr63569.c b/gcc/testsuite/gcc.dg/ipa/pr63569.c new file mode 100644 index 0000000..8bd5c1f --- /dev/null +++ b/gcc/testsuite/gcc.dg/ipa/pr63569.c @@ -0,0 +1,32 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -fdump-ipa-icf-details" } */ + +static int f(int t, int *a) __attribute__((noinline)); + +static int g(int t, volatile int *a) __attribute__((noinline)); +static int g(int t, volatile int *a) +{ + int i; + int tt = 0; + for(i=0;i<t;i++) + tt += *a; + return tt; +} +static int f(int t, int *a) +{ + int i; + int tt = 0; + for(i=0;i<t;i++) + tt += *a; + return tt; +} + + +int h(int t, int *a) +{ + return f(t, a) + g(t, a); +} + +/* { dg-final { scan-ipa-dump "different operand volatility" "icf" } } */ +/* { dg-final { scan-ipa-dump "Equal symbols: 0" "icf" } } */ +/* { dg-final { cleanup-ipa-dump "icf" } } */ |