summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>2003-10-07 22:10:37 +0000
committerjason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>2003-10-07 22:10:37 +0000
commit7d1895d3434f725cd4b0b85dca7e14c368d42bed (patch)
treeaf1cbd44fba3851b025f8df7b0c4bfa9e67fc748
parentf971853078551543075b7bc4d3f62ee2767b2793 (diff)
downloadgcc-7d1895d3434f725cd4b0b85dca7e14c368d42bed.tar.gz
PR c++/12519
* c-semantics.c (genrtl_cleanup_stmt): Ignore the CLEANUP_DECL if it isn't a decl. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@72206 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/c-semantics.c3
-rw-r--r--gcc/testsuite/g++.dg/opt/inline5.C20
3 files changed, 28 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c1170906812..9d8ee4132e4 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 a9825c87e68..a3e1b45343c 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 00000000000..dd61ee6bc01
--- /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();
+}