diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/cp-gimplify.c | 9 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp1y/pr104031.C | 23 |
2 files changed, 30 insertions, 2 deletions
diff --git a/gcc/cp/cp-gimplify.c b/gcc/cp/cp-gimplify.c index b80010e..ad61030 100644 --- a/gcc/cp/cp-gimplify.c +++ b/gcc/cp/cp-gimplify.c @@ -930,9 +930,14 @@ cp_genericize_init_expr (tree *stmt_p) static void cp_genericize_target_expr (tree *stmt_p) { + tree slot = TARGET_EXPR_SLOT (*stmt_p); + /* If TARGET_EXPR is created for some global var initializer, the slot + will have NULL and so is_local_temp will return false for it. If + this is a ssdf, set DECL_CONTEXT now. */ + if (DECL_CONTEXT (slot) == NULL_TREE) + DECL_CONTEXT (slot) = current_function_decl; cp_genericize_init (&TARGET_EXPR_INITIAL (*stmt_p), - TARGET_EXPR_INITIAL (*stmt_p), - TARGET_EXPR_SLOT (*stmt_p)); + TARGET_EXPR_INITIAL (*stmt_p), slot); } /* Genericization context. */ diff --git a/gcc/testsuite/g++.dg/cpp1y/pr104031.C b/gcc/testsuite/g++.dg/cpp1y/pr104031.C new file mode 100644 index 0000000..5f73662 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1y/pr104031.C @@ -0,0 +1,23 @@ +// PR c++/104031 +// { dg-do run { target c++14 } } +// { dg-options "-O2" } + +struct A { + A () {} + ~A () {} +}; +struct B { + A a; + int b = 0; +}; +struct C +{ + [[gnu::noipa]] + C (B x) { if (x.b != 42) __builtin_abort (); } +}; +static C c ({ .a = A{}, .b = 42 }); + +int +main () +{ +} |