mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-03-28 22:33:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

c++: Tweaks for value_dependent_expression_p.

Browse Source 
We may not call value_dependent_expression_p on expressions that are
not potential constant expressions, otherwise value_d could crash,
as I saw recently (in C++98).  So beef up the checking in i_d_e_p.

This revealed a curious issue: when we have __PRETTY_FUNCTION__ in
a template function, we set its DECL_VALUE_EXPR to error_mark_node
(cp_make_fname_decl), so potential_c_e returns false when it gets it,
but value_dependent_expression_p handles it specially and says true.
This broke lambda-generic-pretty1.C.  So take care of that.

And then also tweak uses_template_parms.

gcc/cp/ChangeLog:

	* constexpr.c (potential_constant_expression_1): Treat
	__PRETTY_FUNCTION__ inside a template function as
	potentially-constant.
	* pt.c (uses_template_parms): Call
	instantiation_dependent_expression_p instead of
	value_dependent_expression_p.
	(instantiation_dependent_expression_p): Check
	potential_constant_expression before calling
	value_dependent_expression_p.
This commit is contained in:
Marek Polacek 2020-10-29 15:19:51 -04:00
parent f620e64a6f
commit c2856ceec2
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/cp/constexpr.c
View File

@ -7714,6 +7714,11 @@ potential_constant_expression_1 (tree t, bool want_rval, bool strict, bool now,
}
return false;
}
/* Treat __PRETTY_FUNCTION__ inside a template function as
potentially-constant. */
else if (DECL_PRETTY_FUNCTION_P (t)
&& DECL_VALUE_EXPR (t) == error_mark_node)
return true;
return RECUR (DECL_VALUE_EXPR (t), rval);
}
if (want_rval

5
gcc/cp/pt.c
View File

@ -10755,7 +10755,7 @@ uses_template_parms (tree t)
else if (t == error_mark_node)
dependent_p = false;
else
dependent_p = value_dependent_expression_p (t);
dependent_p = instantiation_dependent_expression_p (t);
processing_template_decl = saved_processing_template_decl;
@ -27294,7 +27294,8 @@ bool
instantiation_dependent_expression_p (tree expression)
{
return (instantiation_dependent_uneval_expression_p (expression)
|| value_dependent_expression_p (expression));
|| (potential_constant_expression (expression)
&& value_dependent_expression_p (expression)));
}
/* Like type_dependent_expression_p, but it also works while not processing