From e525cfa7e30afee5c4c5a4224c5c340ae95cf75f Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Sat, 8 Oct 2016 22:41:47 -0400 Subject: [PATCH] * cp-gimplify.c (cp_fold): Add variable name. From-SVN: r240897 --- gcc/cp/ChangeLog | 2 ++ gcc/cp/cp-gimplify.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 32b011f3462..02adc2b5bf8 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,7 @@ 2016-10-08 Jason Merrill + * 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 48796323523..b085f3a5731 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))) -- 2.30.2