diff options
author | Jan Hubicka <jh@suse.cz> | 2007-11-29 22:57:38 +0100 |
---|---|---|
committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2007-11-29 22:57:38 +0100 |
commit | f6f2da7df7acc7f6a9b7425c9e7ad8c304940299 (patch) | |
tree | 333a102d3377440a02a26d058160b3f6993e09eb /gcc | |
parent | 42924ed71f51fd6c33483ca202fc5a1ccff9b770 (diff) | |
download | gcc-f6f2da7df7acc7f6a9b7425c9e7ad8c304940299.zip gcc-f6f2da7df7acc7f6a9b7425c9e7ad8c304940299.tar.gz gcc-f6f2da7df7acc7f6a9b7425c9e7ad8c304940299.tar.bz2 |
re PR tree-optimization/33434 (inlining miscompilation)
PR tree-optimization/33434
* tree-inline.c (setup_one_parameter): If the value passed to
a parameter is never used, don't set it up.
* gcc.dg/pr33434-1.c: New test.
* gcc.dg/pr33434-2.c: New test.
* gcc.dg/pr33434-3.c: New test.
* gcc.dg/pr33434-4.c: New test.
From-SVN: r130521
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/ChangeLog | 7 | ||||
-rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
-rw-r--r-- | gcc/testsuite/gcc.dg/pr33434-1.c | 25 | ||||
-rw-r--r-- | gcc/testsuite/gcc.dg/pr33434-2.c | 26 | ||||
-rw-r--r-- | gcc/testsuite/gcc.dg/pr33434-3.c | 31 | ||||
-rw-r--r-- | gcc/testsuite/gcc.dg/pr33434-4.c | 18 | ||||
-rw-r--r-- | gcc/tree-inline.c | 8 |
7 files changed, 121 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 376994a..438d303 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2007-11-29 Jan Hubicka <jh@suse.cz> + Jakub Jelinek <jakub@redhat.com> + + PR tree-optimization/33434 + * tree-inline.c (setup_one_parameter): If the value passed to + a parameter is never used, don't set it up. + 2007-11-29 Jakub Jelinek <jakub@redhat.com> PR target/32130 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 1a40211..93e772d 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,11 @@ 2007-11-29 Jakub Jelinek <jakub@redhat.com> + PR tree-optimization/33434 + * gcc.dg/pr33434-1.c: New test. + * gcc.dg/pr33434-2.c: New test. + * gcc.dg/pr33434-3.c: New test. + * gcc.dg/pr33434-4.c: New test. + PR c++/34270 * g++.dg/template/cond7.C: New test. diff --git a/gcc/testsuite/gcc.dg/pr33434-1.c b/gcc/testsuite/gcc.dg/pr33434-1.c new file mode 100644 index 0000000..d646ff7 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr33434-1.c @@ -0,0 +1,25 @@ +/* PR tree-optimization/33434 */ +/* { dg-do run } */ +/* { dg-options "-O2" } */ + +int k; + +void f1 (int a, int b) +{ + a = 1; + b = 1; + if (a) + while (b --) + k = 1; + else + if (b != 1) + __builtin_abort (); +} + +int main (void) +{ + f1 (1, 1); + if (k != 1) + __builtin_abort (); + return 0; +} diff --git a/gcc/testsuite/gcc.dg/pr33434-2.c b/gcc/testsuite/gcc.dg/pr33434-2.c new file mode 100644 index 0000000..7dd614c --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr33434-2.c @@ -0,0 +1,26 @@ +/* PR tree-optimization/33434 */ +/* { dg-do run } */ +/* { dg-options "-O2" } */ + +int k; + +void f1 (int a) +{ + int b; + a = 1; + b = 1; + if (a) + while (b --) + k = 1; + else + if (b != 1) + __builtin_abort (); +} + +int main (void) +{ + f1 (1); + if (k != 1) + __builtin_abort (); + return 0; +} diff --git a/gcc/testsuite/gcc.dg/pr33434-3.c b/gcc/testsuite/gcc.dg/pr33434-3.c new file mode 100644 index 0000000..3e99451 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr33434-3.c @@ -0,0 +1,31 @@ +/* PR tree-optimization/33434 */ +/* { dg-do run } */ +/* { dg-options "-O3" } */ + +int k; + +void __attribute__((noinline)) f2 (int b) +{ + k = b - 1; +} + +void f1 (int a, int b) +{ + f2 (b); + a = 1; + b = 1; + if (a) + while (b --) + k = 1; + else + if (b != 1) + __builtin_abort (); +} + +int main (void) +{ + f1 (1, 1); + if (k != 1) + __builtin_abort (); + return 0; +} diff --git a/gcc/testsuite/gcc.dg/pr33434-4.c b/gcc/testsuite/gcc.dg/pr33434-4.c new file mode 100644 index 0000000..d34675f --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr33434-4.c @@ -0,0 +1,18 @@ +/* PR tree-optimization/33434 */ +/* { dg-do compile } */ +/* { dg-options "-O2" } */ + +void *baz (void); + +static void * +bar (void *x) +{ + x = baz (); + return x; +} + +void * +foo (void *x) +{ + return bar (x); +} diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c index e7fba91..1efc0ed 100644 --- a/gcc/tree-inline.c +++ b/gcc/tree-inline.c @@ -1508,6 +1508,14 @@ setup_one_parameter (copy_body_data *id, tree p, tree value, tree fn, return; } + /* If the value of argument is never used, don't care about initializing + it. */ + if (gimple_in_ssa_p (cfun) && !def && is_gimple_reg (p)) + { + gcc_assert (!value || !TREE_SIDE_EFFECTS (value)); + return; + } + /* Initialize this VAR_DECL from the equivalent argument. Convert the argument to the proper type in case it was promoted. */ if (value) |