From b187901efacd685b07dc020ad8c47c73bd0da647 Mon Sep 17 00:00:00 2001 From: Andrew Pinski Date: Mon, 11 Oct 2004 03:16:47 +0000 Subject: [PATCH] re PR c++/17907 (ice in optimize_inline_calls, at tree-inline.c) 2004-10-10 Andrew Pinski 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 PR c++/17907 * g++.dg/eh/cleanup5.C: New test. From-SVN: r88867 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/semantics.c | 3 ++- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/eh/cleanup5.C | 16 ++++++++++++++++ 4 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/eh/cleanup5.C 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 + + 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 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 + + PR c++/17907 + * g++.dg/eh/cleanup5.C: New test. + 2004-10-10 Mark Mitchell 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()]; +} -- 2.30.2