projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 51e95f4)
* cp-gimplify.c (cp_fold): Add variable name.
authorJason Merrill <jason@redhat.com>
Sun, 9 Oct 2016 02:41:47 +0000 (22:41 -0400)
committerJason Merrill <jason@gcc.gnu.org>
Sun, 9 Oct 2016 02:41:47 +0000 (22:41 -0400)
From-SVN: r240897

gcc/cp/ChangeLog patch | blob | history
gcc/cp/cp-gimplify.c patch | blob | history

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 32b011f346261abd126a51c0839fc84eea73a9e0..02adc2b5bf8490222ef2a07e28a5ef725eee8d3f 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 48796323523294ec13a0291a33262fcec68edbb6..b085f3a57314c72cfdc06def90ca9145ca098fee 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)))