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

decl.c (grok_reference_init): Handle constexpr here.

Browse Source 
* decl.c (grok_reference_init): Handle constexpr here.
	* call.c (initialize_reference): Not here.

From-SVN: r177734
This commit is contained in:
Jason Merrill 2011-08-13 16:03:15 -04:00 committed by Jason Merrill
parent 8434c30579
commit 515756b990
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/cp/ChangeLog
View File

@ -1,3 +1,8 @@
2011-08-13 Jason Merrill <jason@redhat.com>
* decl.c (grok_reference_init): Handle constexpr here.
* call.c (initialize_reference): Not here.
2011-08-12 Jason Merrill <jason@redhat.com>
PR c++/50034

6
gcc/cp/call.c
View File

@ -8820,12 +8820,6 @@ initialize_reference (tree type, tree expr, tree decl, tree *cleanup,
(build_pointer_type (base_conv_type), expr,
complain));
expr = build_nop (type, expr);
if (DECL_DECLARED_CONSTEXPR_P (decl))
{
expr = cxx_constant_value (expr);
DECL_INITIALIZED_BY_CONSTANT_EXPRESSION_P (decl)
= reduced_constant_expression_p (expr);
}
}
}
else

6
gcc/cp/decl.c
View File

@ -4597,6 +4597,12 @@ grok_reference_init (tree decl, tree type, tree init, tree *cleanup)
explicitly); we need to allow the temporary to be initialized
first. */
tmp = initialize_reference (type, init, decl, cleanup, tf_warning_or_error);
if (DECL_DECLARED_CONSTEXPR_P (decl))
{
tmp = cxx_constant_value (tmp);
DECL_INITIALIZED_BY_CONSTANT_EXPRESSION_P (decl)
= reduced_constant_expression_p (tmp);
}
if (tmp == error_mark_node)
return NULL_TREE;