diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/cp/cp-gimplify.c | 17 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/guality/pr46815.C | 25 |
4 files changed, 54 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 6dd121a..b28af3c 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2010-12-15 Jakub Jelinek <jakub@redhat.com> + + PR debug/46815 + * cp-gimplify.c (cp_genericize): When changing RESULT_DECL + into invisible reference, change also DECL_VALUE_EXPR of + NRV optimized variable. + 2010-12-15 Paolo Carlini <paolo.carlini@oracle.com> PR c++/42083 diff --git a/gcc/cp/cp-gimplify.c b/gcc/cp/cp-gimplify.c index 42d7d58..ca62df3 100644 --- a/gcc/cp/cp-gimplify.c +++ b/gcc/cp/cp-gimplify.c @@ -958,6 +958,23 @@ cp_genericize (tree fndecl) DECL_BY_REFERENCE (t) = 1; TREE_ADDRESSABLE (t) = 0; relayout_decl (t); + if (DECL_NAME (t)) + { + /* Adjust DECL_VALUE_EXPR of the original var. */ + tree outer = outer_curly_brace_block (current_function_decl); + tree var; + + if (outer) + for (var = BLOCK_VARS (outer); var; var = DECL_CHAIN (var)) + if (DECL_NAME (t) == DECL_NAME (var) + && DECL_HAS_VALUE_EXPR_P (var) + && DECL_VALUE_EXPR (var) == t) + { + tree val = convert_from_reference (t); + SET_DECL_VALUE_EXPR (var, val); + break; + } + } } /* If we're a clone, the body is already GIMPLE. */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 1d865c6..a8cb558 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2010-12-15 Jakub Jelinek <jakub@redhat.com> + + PR debug/46815 + * g++.dg/guality/pr46815.C: New test. + 2010-12-15 Paolo Carlini <paolo.carlini@oracle.com> PR c++/42083 diff --git a/gcc/testsuite/g++.dg/guality/pr46815.C b/gcc/testsuite/g++.dg/guality/pr46815.C new file mode 100644 index 0000000..41b9219 --- /dev/null +++ b/gcc/testsuite/g++.dg/guality/pr46815.C @@ -0,0 +1,25 @@ +// PR debug/46815 +// { dg-do run } +// { dg-options "-g" } +// { dg-skip-if "" { *-*-* } { "*" } { "-O0" } } + +struct S +{ + int i; + S () { i = 42; } + virtual void foo (void) {} +}; + +S +bar () +{ + S s; + return s; // { dg-final { gdb-test 17 "s.i" "42" } } +} + +int +main () +{ + S s = bar (); + return s.i - 42; +} |