diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/c-semantics.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/opt/inline5.C | 20 |
3 files changed, 28 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c117090..9d8ee41 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2003-10-07 Jason Merrill <jason@redhat.com> + + PR c++/12519 + * c-semantics.c (genrtl_cleanup_stmt): Ignore the CLEANUP_DECL if + it isn't a decl. + 2003-10-07 Alexandre Oliva <aoliva@redhat.com> * gcc.c (cpp_options): Only pass -fworking-directory for -g* if diff --git a/gcc/c-semantics.c b/gcc/c-semantics.c index a9825c8..a3e1b45 100644 --- a/gcc/c-semantics.c +++ b/gcc/c-semantics.c @@ -758,7 +758,8 @@ void genrtl_cleanup_stmt (tree t) { tree decl = CLEANUP_DECL (t); - if (!decl || (DECL_SIZE (decl) && TREE_TYPE (decl) != error_mark_node)) + if (!decl || !DECL_P (decl) + || (DECL_SIZE (decl) && TREE_TYPE (decl) != error_mark_node)) expand_decl_cleanup_eh (decl, CLEANUP_EXPR (t), CLEANUP_EH_ONLY (t)); } diff --git a/gcc/testsuite/g++.dg/opt/inline5.C b/gcc/testsuite/g++.dg/opt/inline5.C new file mode 100644 index 0000000..dd61ee6b --- /dev/null +++ b/gcc/testsuite/g++.dg/opt/inline5.C @@ -0,0 +1,20 @@ +// PR c++/12519 + +// { dg-do compile } +// { dg-options "-O" } + +struct A +{ + ~A(); +}; + +inline const A foo() +{ + A a; + return a; +} + +A bar() +{ + return foo(); +} |