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

* 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gcc/cp/ChangeLog
View File

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

2
gcc/cp/cp-gimplify.c
View File

@ -2255,7 +2255,7 @@ cp_fold (tree x)
if (TREE_CODE (TREE_TYPE (x)) == BOOLEAN_TYPE) 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))) if (!VOID_TYPE_P (TREE_TYPE (op1)))
op1 = cp_truthvalue_conversion (op1); op1 = cp_truthvalue_conversion (op1);
if (!VOID_TYPE_P (TREE_TYPE (op2))) if (!VOID_TYPE_P (TREE_TYPE (op2)))