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

From-SVN: r240897

* cp-gimplify.c (cp_fold): Add variable name.
From-SVN: r240897
e525cfa7 · Jason Merrill · Jason Merrill · 51e95f4e · e525cfa7 · e525cfa7
Commit e525cfa7 authored Oct 08, 2016 by Jason Merrill Committed by Jason Merrill Oct 08, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletions

gcc/cp/ChangeLog
+2 -0

gcc/cp/cp-gimplify.c
+1 -1

No files found.
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
 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.


--- a/gcc/cp/cp-gimplify.c
+++ b/gcc/cp/cp-gimplify.c
@@ -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)))