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

From-SVN: r240897

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 32b011f..02adc2b 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -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.
 

diff --git a/gcc/cp/cp-gimplify.c b/gcc/cp/cp-gimplify.c
index 4879632..b085f3a 100644 (file)
--- 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)))