OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR c++/20416 (Incorrect lifetime for temporary with static const reference) 

PR c++/20416
        * call.c (initialize_reference): Handle local static reference
        temps properly.

From-SVN: r129020
This commit is contained in:
Jason Merrill 2007-10-04 13:58:07 -04:00 committed by Jason Merrill
parent 37b22c8283
commit 42f02385bd
3 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/cp/ChangeLog
View File

@ -1,3 +1,9 @@
2007-10-04 Jason Merrill <jason@redhat.com>
PR c++/20416
* call.c (initialize_reference): Handle local static reference
temps properly.
2007-10-03 Jason Merrill <jason@redhat.com>
PR c++/32470

6
gcc/cp/call.c
View File

@ -6824,7 +6824,11 @@ initialize_reference (tree type, tree expr, tree decl, tree *cleanup)
if (at_function_scope_p ())
{
add_decl_expr (var);
*cleanup = cxx_maybe_build_cleanup (var);
if (TREE_STATIC (var))
init = add_stmt_to_compound (init, register_dtor_fn (var));
else
*cleanup = cxx_maybe_build_cleanup (var);
/* We must be careful to destroy the temporary only
after its initialization has taken place. If the

32
gcc/testsuite/g++.dg/init/ref15.C Normal file
View File

@ -0,0 +1,32 @@
// PR c++/20416. We correctly constructed the temporary S in foo(),
// but incorrectly destroyed it every time foo() was called.
// { dg-do run }
extern "C" void abort (void);
extern "C" void _exit (int);
int c, exiting;
struct S {
S() { ++c; }
S(const S &) { ++c; }
~S()
{
if (!exiting) abort ();
_exit (0);
}
};
void
foo (void)
{
static const S &s = S();
}
int main ()
{
if (c != 0)
abort ();
foo ();
foo ();
if (c != 1)
abort ();
exiting = 1;
return 1;
}