diff options
| author | Jason Merrill <jason@redhat.com> | 2022-01-22 17:11:54 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@redhat.com> | 2022-01-22 22:18:42 -0500 |
| commit | 9718bc4b03c1a94f7cf64860bbc828aa53c56234 (patch) | |
| tree | afb8867506fec1386ffb86456536924737a562b0 /gcc/cp | |
| parent | 053bcc97f4a59e3f2811b8a1edf60fd733a580a0 (diff) | |
| download | gcc-9718bc4b03c1a94f7cf64860bbc828aa53c56234.zip gcc-9718bc4b03c1a94f7cf64860bbc828aa53c56234.tar.gz gcc-9718bc4b03c1a94f7cf64860bbc828aa53c56234.tar.bz2 | |
c++: array temporary at file scope [PR104182]
This is the same issue as PR104031, but that patch doesn't fix this
testcase because in this case, current_function_decl isn't set when we get
to cp_genericize_target_expr. But there seems to be no need for
is_local_temp to check for function scope; !TREE_STATIC should be enough.
PR c++/104182
gcc/cp/ChangeLog:
* cp-gimplify.cc (cp_genericize_target_expr): Make sure nothing
has set DECL_INITIAL on a TARGET_EXPR slot.
* tree.cc (is_local_temp): Don't check DECL_CONTEXT.
gcc/testsuite/ChangeLog:
* g++.dg/cpp0x/initlist127.C: New test.
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/cp-gimplify.cc | 6 | ||||
| -rw-r--r-- | gcc/cp/tree.cc | 3 |
2 files changed, 2 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. */ |