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

re PR c++/49528 (g++ fails to destroy temporary object when subobject is used to initialize a reference)

Browse Source 
PR c++/49528
	* semantics.c (potential_constant_expression_1): A TARGET_EXPR
	with a cleanup isn't constant.
	(cxx_eval_constant_expression): Likewise.
	* init.c (expand_default_init): Use maybe_constant_init.

From-SVN: r175409
This commit is contained in:
Jason Merrill 2011-06-26 10:00:33 -04:00 committed by Jason Merrill
parent 4ff10c0ec2
commit 07a9e891c9
6 changed files with 60 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/cp/ChangeLog
View File

@ -1,3 +1,11 @@
2011-06-26 Jason Merrill <jason@redhat.com>
PR c++/49528
* semantics.c (potential_constant_expression_1): A TARGET_EXPR
with a cleanup isn't constant.
(cxx_eval_constant_expression): Likewise.
* init.c (expand_default_init): Use maybe_constant_init.
2011-06-24 Jakub Jelinek <jakub@redhat.com>
PR c++/46400

2
gcc/cp/init.c
View File

@ -1514,7 +1514,7 @@ expand_default_init (tree binfo, tree true_exp, tree exp, tree init, int flags,
tree fn = get_callee_fndecl (rval);
if (fn && DECL_DECLARED_CONSTEXPR_P (fn))
{
tree e = maybe_constant_value (rval);
tree e = maybe_constant_init (rval);
if (TREE_CONSTANT (e))
rval = build2 (INIT_EXPR, type, exp, e);
}

20
gcc/cp/semantics.c
View File

@ -7020,6 +7020,16 @@ cxx_eval_constant_expression (const constexpr_call *call, tree t,
break;
case TARGET_EXPR:
/* A cleanup isn't constant. */
if (TARGET_EXPR_CLEANUP (t))
{
if (!allow_non_constant)
error ("temporary of type %qT needing destruction in a "
"constant expression", TREE_TYPE (t));
*non_constant_p = true;
break;
}
/* else fall through. */
case INIT_EXPR:
/* Pass false for 'addr' because these codes indicate
initialization of a temporary. */
@ -7840,8 +7850,16 @@ potential_constant_expression_1 (tree t, bool want_rval, tsubst_flags_t flags)
return potential_constant_expression_1 (TREE_OPERAND (t, 1),
want_rval, flags);
case INIT_EXPR:
case TARGET_EXPR:
/* A cleanup isn't constant. */
if (TARGET_EXPR_CLEANUP (t))
{
if (flags & tf_error)
error ("temporary of type %qT needing destruction in a "
"constant expression", TREE_TYPE (t));
return false;
}
case INIT_EXPR:
return potential_constant_expression_1 (TREE_OPERAND (t, 1),
rval, flags);

6
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,9 @@
2011-06-26 Jason Merrill <jason@redhat.com>
PR c++/49528
* g++.dg/init/ref19.C: New.
* g++.dg/cpp0x/constexpr-cleanup.C: New.
2011-06-26 Jakub Jelinek <jakub@redhat.com>
PR tree-optimization/48377

9
gcc/testsuite/g++.dg/cpp0x/constexpr-cleanup.C Normal file
View File

@ -0,0 +1,9 @@
// { dg-options -std=c++0x }
struct A
{
int i;
~A();
};
constexpr int i = A().i; // { dg-error "destruction" }

17
gcc/testsuite/g++.dg/init/ref19.C Normal file
View File

@ -0,0 +1,17 @@
// PR c++/49528
// { dg-do run }
int d;
struct A
{
int i;
~A() { ++d; };
};
int main()
{
const int &r = A().i;
if (d != 1)
return 1;
}