mirrors/gcc
0
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2024-12-19 17:15:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

c++: NRV and ref-extended temps [PR101442]

Browse Source 
This issue goes back to r83221, where the cleanup for extended ref temps
changed from being unconditional to being tied to the declaration they
formed part of the initializer for.

The named return value optimization changes the cleanup for the NRV variable
to only run on the EH path; we don't want that change to affect temporary
cleanups.  The perform_member_init change isn't necessary (there 'decl' is a
COMPONENT_REF), it's just for consistency.

	PR c++/101442

gcc/cp/ChangeLog:

	* decl.cc (cp_finish_decl): Don't pass decl to push_cleanup.
	* init.cc (perform_member_init): Likewise.
	* semantics.cc (push_cleanup): Adjust comment.

gcc/testsuite/ChangeLog:

	* g++.dg/cpp0x/initlist-nrv1.C: New test.
This commit is contained in:
Jason Merrill 2022-04-13 13:23:08 -04:00
parent 019d6d4149
commit ad8161e6d7
4 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gcc/cp/decl.cc
View File

@ -8554,7 +8554,7 @@ cp_finish_decl (tree decl, tree init, bool init_const_expr_p,
{
for (tree t : *cleanups)
{
push_cleanup (decl, t, false);
push_cleanup (NULL_TREE, t, false);
/* As in initialize_local_var. */
wrap_temporary_cleanups (init, t);
}

2
gcc/cp/init.cc
View File

@ -1066,7 +1066,7 @@ perform_member_init (tree member, tree init, hash_set<tree> &uninitialized)
init = build2 (INIT_EXPR, type, decl, init);
finish_expr_stmt (init);
FOR_EACH_VEC_ELT (*cleanups, i, t)
push_cleanup (decl, t, false);
push_cleanup (NULL_TREE, t, false);
}
else if (type_build_ctor_call (type)
|| (init && CLASS_TYPE_P (strip_array_types (type))))

3
gcc/cp/semantics.cc
View File

@ -666,7 +666,8 @@ do_pushlevel (scope_kind sk)
/* Queue a cleanup. CLEANUP is an expression/statement to be executed
when the current scope is exited. EH_ONLY is true when this is not
meant to apply to normal control flow transfer. */
meant to apply to normal control flow transfer. DECL is the VAR_DECL
being cleaned up, if any, or null for temporaries or subobjects. */
void
push_cleanup (tree decl, tree cleanup, bool eh_only)

34
gcc/testsuite/g++.dg/cpp0x/initlist-nrv1.C Normal file
View File

@ -0,0 +1,34 @@
// PR c++/101442
// { dg-do run { target c++11 } }
bool destroyed = false;
struct A
{
A() {}
A(const A &) = delete;
A &operator=(const A &) = delete;
~A() {destroyed = true;}
};
struct B
{
const A &a;
struct string {
string(const char*) { }
~string() { }
} s;
};
B foo()
{
B ret{ A{}, "" };
return ret;
}
int main()
{
B b = foo();
if (!destroyed)
__builtin_abort();
}