The patch for 41449 introduced more EH cleanup regions in aggregate
initialization, which caused problems with EH regions trying to overlap.
Since individual subobject initializations are each full-expressions,
the solution here is to treat them as such by wrapping them with a
CLEANUP_POINT_EXPR.
Tested x86_64-pc-linux-gnu, applying to trunk.
commit fe3e0c96bfe23dc7312115ebd89303536661f6e3
Author: Jason Merrill <ja...@redhat.com>
Date: Tue Oct 25 13:43:19 2011 -0400
PR c++/50866
PR c++/41449
* semantics.c (maybe_cleanup_point_expr_void): No longer static.
* typeck2.c (split_nonconstant_init_1): Use it.
* cp-tree.h: Declare it.
* decl.c (wrap_cleanups_r): Stop at CLEANUP_POINT_EXPR.
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index d0e874b..b20e7d1 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -5372,6 +5372,7 @@ extern int stmts_are_full_exprs_p (void);
extern void init_cp_semantics (void);
extern tree do_poplevel (tree);
extern void add_decl_expr (tree);
+extern tree maybe_cleanup_point_expr_void (tree);
extern tree finish_expr_stmt (tree);
extern tree begin_if_stmt (void);
extern void finish_if_stmt_cond (tree, tree);
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index a21cf46..26e9847 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -5718,7 +5718,9 @@ make_rtl_for_nonlocal_decl (tree decl, tree init, const char* asmspec)
static tree
wrap_cleanups_r (tree *stmt_p, int *walk_subtrees, void *data)
{
- if (TYPE_P (*stmt_p))
+ /* Stop at types or full-expression boundaries. */
+ if (TYPE_P (*stmt_p)
+ || TREE_CODE (*stmt_p) == CLEANUP_POINT_EXPR)
{
*walk_subtrees = 0;
return NULL_TREE;
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 42195be..84f112c 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -424,7 +424,7 @@ maybe_cleanup_point_expr (tree expr)
expression. The reason why we do this is because the original type might be
an aggregate and we cannot create a temporary variable for that type. */
-static tree
+tree
maybe_cleanup_point_expr_void (tree expr)
{
if (!processing_template_decl && stmts_are_full_exprs_p ())
diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c
index 0cb1104..57cd5e0 100644
--- a/gcc/cp/typeck2.c
+++ b/gcc/cp/typeck2.c
@@ -573,6 +573,7 @@ split_nonconstant_init_1 (tree dest, tree init)
code = build2 (INIT_EXPR, inner_type, sub, value);
code = build_stmt (input_location, EXPR_STMT, code);
+ code = maybe_cleanup_point_expr_void (code);
add_stmt (code);
if (!TYPE_HAS_TRIVIAL_DESTRUCTOR (inner_type))
{
diff --git a/gcc/testsuite/g++.dg/init/aggr7.C b/gcc/testsuite/g++.dg/init/aggr7.C
new file mode 100644
index 0000000..bec952c
--- /dev/null
+++ b/gcc/testsuite/g++.dg/init/aggr7.C
@@ -0,0 +1,13 @@
+// PR c++/50866
+
+struct A { A(); ~A(); };
+struct B { B(const char *, const A& = A()); ~B(); };
+struct C {
+ B b1, b2;
+};
+void f()
+{
+ C c = {
+ "a","b"
+ };
+}
