aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2016-10-08 22:41:47 -0400
committerJason Merrill <jason@gcc.gnu.org>2016-10-08 22:41:47 -0400
commite525cfa7e30afee5c4c5a4224c5c340ae95cf75f (patch)
tree7219c030f2bb2fb0f86c0d250eec5df89a84c881 /gcc/cp
parent51e95f4ea9ad5e427fac5fd9007a4078a45375ae (diff)
downloadgcc-e525cfa7e30afee5c4c5a4224c5c340ae95cf75f.zip
gcc-e525cfa7e30afee5c4c5a4224c5c340ae95cf75f.tar.gz
gcc-e525cfa7e30afee5c4c5a4224c5c340ae95cf75f.tar.bz2
* cp-gimplify.c (cp_fold): Add variable name.
From-SVN: r240897
Diffstat (limited to 'gcc/cp')
-rw-r--r--gcc/cp/ChangeLog2
-rw-r--r--gcc/cp/cp-gimplify.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 32b011f..02adc2b 100644
--- 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
--- 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)))