diff options
| author | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-07-21 14:59:43 +0000 |
|---|---|---|
| committer | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-07-21 14:59:43 +0000 |
| commit | 94c2fbd9dc977f4b7d5e3d9815ea0350b45e6f78 (patch) | |
| tree | e0239dfb27c59b246168c4cbf60988130d54e6ee /gcc | |
| parent | 735fba5b6a6905dfdeda320f1a74b31e78af7a16 (diff) | |
PR tree-optimization/40813
* tree-inline.c (copy_bb): Regimplify RHS after last stmt, not before
it.
* g++.dg/opt/inline15.C: New test.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_4-branch@149858 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/opt/inline15.C | 42 | ||||
| -rw-r--r-- | gcc/tree-inline.c | 4 |
4 files changed, 55 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 35ed1ecb8ec..a488eb64c75 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2009-07-21 Jakub Jelinek <jakub@redhat.com> + + PR tree-optimization/40813 + * tree-inline.c (copy_bb): Regimplify RHS after last stmt, not before + it. + 2009-07-21 Uros Bizjak <ubizjak@gmail.com> Backport from mainline: diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 8d517d3fe4c..5da55e4e074 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2009-07-21 Jakub Jelinek <jakub@redhat.com> + + PR tree-optimization/40813 + * g++.dg/opt/inline15.C: New test. + 2009-07-21 Uros Bizjak <ubizjak@gmail.com> PR target/40809 diff --git a/gcc/testsuite/g++.dg/opt/inline15.C b/gcc/testsuite/g++.dg/opt/inline15.C new file mode 100644 index 00000000000..5da3a610519 --- /dev/null +++ b/gcc/testsuite/g++.dg/opt/inline15.C @@ -0,0 +1,42 @@ +// PR tree-optimization/40813 +// { dg-do compile } +// { dg-options "-O -fcheck-new" } + +typedef __SIZE_TYPE__ size_t; +typedef void *P; +struct A; +struct B +{ + void *b[5]; + A *foo () { return (A *) & b[0]; } +}; +struct A +{ + void *operator new (size_t x, B &y) { return y.foo (); } +}; +struct C : public A +{ + virtual int bar () { } +}; +struct D : public C +{ + static B baz (unsigned *x) { B b; new (b) D (x); return b; } + D (unsigned *x) { } +}; +struct E +{ + B e; + B fn (unsigned *a) { return D::baz (a); } + E (P b, unsigned *a) : e (fn (a)) { } +}; + +static unsigned * +fn2 () +{ +} + +void +test (P x) +{ + E (x, fn2 ()); +} diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c index 1bbd7212950..83d0eeb7d11 100644 --- a/gcc/tree-inline.c +++ b/gcc/tree-inline.c @@ -1355,8 +1355,8 @@ copy_bb (copy_body_data *id, basic_block bb, int frequency_scale, { tree new_rhs; new_rhs = force_gimple_operand_gsi (&seq_gsi, - gimple_assign_rhs1 (stmt), - true, NULL, true, GSI_SAME_STMT); + gimple_assign_rhs1 (stmt), + true, NULL, false, GSI_NEW_STMT); gimple_assign_set_rhs1 (stmt, new_rhs); id->regimplify = false; } |