git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

semantics.c (maybe_constant_value): Check instantiation_dependent_expression_p. 

* semantics.c (maybe_constant_value): Check
	instantiation_dependent_expression_p.
	* pt.c (build_non_dependent_expr): Don't check it here.

From-SVN: r197327
This commit is contained in:
Jason Merrill 2013-04-01 17:18:33 -04:00 committed by Jason Merrill
parent 879b0a1db9
commit 2ad8cf261d
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcc/cp/ChangeLog
View File

@ -1,5 +1,9 @@
2013-04-01 Jason Merrill <jason@redhat.com>
* semantics.c (maybe_constant_value): Check
instantiation_dependent_expression_p.
* pt.c (build_non_dependent_expr): Don't check it here.
PR c++/56772
* init.c (build_new): Don't try to process an array initializer
at template definition time.

3
gcc/cp/pt.c
View File

@ -20444,8 +20444,7 @@ build_non_dependent_expr (tree expr)
#ifdef ENABLE_CHECKING
/* Try to get a constant value for all non-dependent expressions in
order to expose bugs in *_dependent_expression_p and constexpr. */
if (cxx_dialect >= cxx0x
&& !instantiation_dependent_expression_p (expr))
if (cxx_dialect >= cxx0x)
maybe_constant_value (fold_non_dependent_expr_sfinae (expr, tf_none));
#endif

5
gcc/cp/semantics.c
View File

@ -8270,11 +8270,10 @@ maybe_constant_value (tree t)
{
tree r;
if (type_dependent_expression_p (t)
if (instantiation_dependent_expression_p (t)
|| type_unknown_p (t)
|| BRACE_ENCLOSED_INITIALIZER_P (t)
|| !potential_constant_expression (t)
|| value_dependent_expression_p (t))
|| !potential_constant_expression (t))
{
if (TREE_OVERFLOW_P (t))
{