summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpinskia <pinskia@138bc75d-0d04-0410-961f-82ee72b054a4>2004-10-11 03:16:47 +0000
committerpinskia <pinskia@138bc75d-0d04-0410-961f-82ee72b054a4>2004-10-11 03:16:47 +0000
commit56dfff01254b52777564235746dabcdee1465c12 (patch)
treeb070f35d5388bd4b6ba19d422c594efdb733d896
parent48dc32ad890dc2a7d4079ee6799aa2a16df4e701 (diff)
downloadgcc-56dfff01254b52777564235746dabcdee1465c12.tar.gz
2004-10-10 Andrew Pinski <pinskia@physics.uc.edu>
PR c++/17907 * semantics.c (add_decl_expr): If the decl has a size which has side effects then the decl expression needs a cleanup point. 2004-10-10 Andrew Pinski <pinskia@physics.uc.edu> PR c++/17907 * g++.dg/eh/cleanup5.C: New test. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@88867 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/semantics.c3
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/g++.dg/eh/cleanup5.C16
4 files changed, 29 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 65abf7d17c8..d6aca574f7c 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-10 Andrew Pinski <pinskia@physics.uc.edu>
+
+ PR c++/17907
+ * semantics.c (add_decl_expr): If the decl has a size which
+ has side effects then the decl expression needs a cleanup point.
+
2004-10-10 Mark Mitchell <mark@codesourcery.com>
PR c++/17393
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 124af39e586..45912c1707b 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -368,7 +368,8 @@ void
add_decl_expr (tree decl)
{
tree r = build_stmt (DECL_EXPR, decl);
- if (DECL_INITIAL (decl))
+ if (DECL_INITIAL (decl)
+ || (DECL_SIZE (decl) && TREE_SIDE_EFFECTS (DECL_SIZE (decl))))
r = maybe_cleanup_point_expr (r);
add_stmt (r);
}
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d17818fe73d..ac9574dff53 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-10 Andrew Pinski <pinskia@physics.uc.edu>
+
+ PR c++/17907
+ * g++.dg/eh/cleanup5.C: New test.
+
2004-10-10 Mark Mitchell <mark@codesourcery.com>
PR c++/17393
diff --git a/gcc/testsuite/g++.dg/eh/cleanup5.C b/gcc/testsuite/g++.dg/eh/cleanup5.C
new file mode 100644
index 00000000000..b78c73afcff
--- /dev/null
+++ b/gcc/testsuite/g++.dg/eh/cleanup5.C
@@ -0,0 +1,16 @@
+// PR 17907
+// { dg-do compile }
+// We lost a CLEANUP_POINT_EXPR, leading to a crash destroying temp of A.
+
+
+struct String {
+ ~String();
+ int size() const;
+};
+struct CodingSystem {
+ String convertOut() const;
+};
+void inputOpened(CodingSystem *outputCodingSystem)
+{
+ char filePath[outputCodingSystem->convertOut().size()];
+}