* cp-gimplify.c (cp_fold): Add variable name.

From-SVN: r240897
This commit is contained in:
Jason Merrill 2016-10-08 22:41:47 -04:00 committed by Jason Merrill
parent 51e95f4ea9
commit e525cfa7e3
2 changed files with 3 additions and 1 deletions

View File

@ -1,5 +1,7 @@
2016-10-08 Jason Merrill <jason@redhat.com>
* cp-gimplify.c (cp_fold): Add variable name.
* cp-gimplify.c (cp_fold): Distribute cp_truthvalue_conversion
into COND_EXPR.

View File

@ -2255,7 +2255,7 @@ cp_fold (tree x)
if (TREE_CODE (TREE_TYPE (x)) == BOOLEAN_TYPE)
{
warning_sentinel (warn_int_in_bool_context);
warning_sentinel s (warn_int_in_bool_context);
if (!VOID_TYPE_P (TREE_TYPE (op1)))
op1 = cp_truthvalue_conversion (op1);
if (!VOID_TYPE_P (TREE_TYPE (op2)))