diff options
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/cp/cp-gimplify.cc | 6 | ||||
-rw-r--r-- | gcc/cp/tree.cc | 3 | ||||
-rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/initlist127.C | 39 |
3 files changed, 41 insertions, 7 deletions
diff --git a/gcc/cp/cp-gimplify.cc b/gcc/cp/cp-gimplify.cc index 0166ef6..d1c653c 100644 --- a/gcc/cp/cp-gimplify.cc +++ b/gcc/cp/cp-gimplify.cc @@ -931,13 +931,9 @@ 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), slot); + gcc_assert (!DECL_INITIAL (slot)); } /* Genericization context. */ diff --git a/gcc/cp/tree.cc b/gcc/cp/tree.cc index f88006a..5d453e4 100644 --- a/gcc/cp/tree.cc +++ b/gcc/cp/tree.cc @@ -557,8 +557,7 @@ bool is_local_temp (tree decl) { return (VAR_P (decl) && DECL_ARTIFICIAL (decl) - && !TREE_STATIC (decl) - && DECL_FUNCTION_SCOPE_P (decl)); + && !TREE_STATIC (decl)); } /* Set various status flags when building an AGGR_INIT_EXPR object T. */ diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist127.C b/gcc/testsuite/g++.dg/cpp0x/initlist127.C new file mode 100644 index 0000000..ebe5924 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/initlist127.C @@ -0,0 +1,39 @@ +// PR c++/104182 +// { dg-do run { target c++11 } } + +#include <initializer_list> + +int b; + +struct stringy { + const char *p; + stringy(const char *p): p(p) { ++b; } + const char& operator[](int i) const { return p[i]; } + ~stringy() { --b; } +}; + +struct S +{ + int A; + stringy B; +}; + +struct veccy { + S s; + veccy (const std::initializer_list<S> &l): s(*l.begin()) {} + const S& operator[](int i) const { return s; } +}; + +struct V +{ + veccy v; +}; + +static const V v{ { { { 237, "2" } } } }; + +int main() +{ + if (v.v[0].A != 237 || v.v[0].B[0] != '2') + __builtin_abort(); + return 0; +} |