invoke.texi: Update -Wint-in-bool-context.

2016-10-03  Bernd Edlinger  <bernd.edlinger@hotmail.de>

        * doc/invoke.texi: Update -Wint-in-bool-context.

c-family:
2016-10-03  Bernd Edlinger  <bernd.edlinger@hotmail.de>

        * c-common.c (c_common_truthvalue_conversion): Warn for suspicious
        left shift in boolean context.

cp:
2016-10-03  Bernd Edlinger  <bernd.edlinger@hotmail.de>

        * parser.c (cp_parser_condition): Fix a warning.

testsuite:
2016-10-03  Bernd Edlinger  <bernd.edlinger@hotmail.de>

        * c-c++-common/Wint-in-bool-context.c: Update test.

From-SVN: r240706

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 05e527d406b5388ea61c86fd2844c67aed3d0cc6..f485096e76819f50437114bb8075e045575896e2 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2016-10-03  Bernd Edlinger  <bernd.edlinger@hotmail.de>
+
+       * doc/invoke.texi: Update -Wint-in-bool-context.
+
 2016-10-02  Jakub Jelinek  <jakub@redhat.com>
 
        * dwarf2out.c (output_fde, output_call_frame_info,

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 3e606940d1323c5e9ef7ffc73bf6aaca3ca613d4..6c2f3cf5655b6b9fd55ddbca7479b650b53eb42c 100644 (file)
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,8 @@
+2016-10-03  Bernd Edlinger  <bernd.edlinger@hotmail.de>
+
+       * c-common.c (c_common_truthvalue_conversion): Warn for suspicious
+       left shift in boolean context.
+
 2016-09-29  Jakub Jelinek  <jakub@redhat.com>
 
        Implement P0001R1 - C++17 removal of register storage class specifier

diff --git a/gcc/c-family/c-common.c b/gcc/c-family/c-common.c
index 2652259a312d76394192575379d00f6d93313404..491c637b5605cef48c184104570faf612c321ba6 100644 (file)
--- a/gcc/c-family/c-common.c
+++ b/gcc/c-family/c-common.c
@@ -4655,6 +4655,11 @@ c_common_truthvalue_conversion (location_t location, tree expr)
        return c_common_truthvalue_conversion (location,
                                               TREE_OPERAND (expr, 0));
 
+    case LSHIFT_EXPR:
+      warning_at (EXPR_LOCATION (expr), OPT_Wint_in_bool_context,
+                 "<< in boolean context, did you mean '<' ?");
+      break;
+
     case COND_EXPR:
       if (warn_int_in_bool_context
          && !from_macro_definition_at (EXPR_LOCATION (expr)))
@@ -4676,6 +4681,8 @@ c_common_truthvalue_conversion (location_t location, tree expr)
        {
          tree op1 = TREE_OPERAND (expr, 1);
          tree op2 = TREE_OPERAND (expr, 2);
+         int w = warn_int_in_bool_context;
+         warn_int_in_bool_context = 0;
          /* In C++ one of the arms might have void type if it is throw.  */
          if (!VOID_TYPE_P (TREE_TYPE (op1)))
            op1 = c_common_truthvalue_conversion (location, op1);
@@ -4683,10 +4690,13 @@ c_common_truthvalue_conversion (location_t location, tree expr)
            op2 = c_common_truthvalue_conversion (location, op2);
          expr = fold_build3_loc (location, COND_EXPR, truthvalue_type_node,
                                  TREE_OPERAND (expr, 0), op1, op2);
+         warn_int_in_bool_context = w;
          goto ret;
        }
       else
        {
+         int w = warn_int_in_bool_context;
+         warn_int_in_bool_context = 0;
          /* Folding will happen later for C.  */
          expr = build3 (COND_EXPR, truthvalue_type_node,
                         TREE_OPERAND (expr, 0),
@@ -4694,6 +4704,7 @@ c_common_truthvalue_conversion (location_t location, tree expr)
                                                         TREE_OPERAND (expr, 1)),
                         c_common_truthvalue_conversion (location,
                                                         TREE_OPERAND (expr, 2)));
+         warn_int_in_bool_context = w;
          goto ret;
        }
 

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index fb0c0e0ffaa70eacdd30b69538ff29b1728b3920..595624c2e298db25b5ab3b66b78f8acc3e724a7a 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2016-10-03  Bernd Edlinger  <bernd.edlinger@hotmail.de>
+
+       * parser.c (cp_parser_condition): Fix a warning.
+
 2016-09-29  Jakub Jelinek  <jakub@redhat.com>
 
        Implement P0001R1 - C++17 removal of register storage class specifier

diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index f672b8de18859f65ff60e4f8bc3e6ee68ce9cb4e..16b895cf37a8365dfb1e4aeeeb020ce53e4ae7cd 100644 (file)
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -11244,7 +11244,7 @@ cp_parser_condition (cp_parser* parser)
        {
          tree pushed_scope;
          bool non_constant_p;
-         bool flags = LOOKUP_ONLYCONVERTING;
+         int flags = LOOKUP_ONLYCONVERTING;
 
          /* Create the declaration.  */
          decl = start_decl (declarator, &type_specifiers,

diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index fa1552988e3796ecb676fcd0060e0a704b699c59..d9667e7f5d91b25e4160fdfc6aae2e5d64ba260d 100644 (file)
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -6038,7 +6038,8 @@ of the C++ standard.
 @opindex Wno-int-in-bool-context
 Warn for suspicious use of integer values where boolean values are expected,
 such as conditional expressions (?:) using non-boolean integer constants in
-boolean context, like @code{if (a <= b ? 2 : 3)}.
+boolean context, like @code{if (a <= b ? 2 : 3)}.  Or left shifting in
+boolean context, like @code{for (a = 0; 1 << a; a++);}.
 This warning is enabled by @option{-Wall}.
 
 @item -Wno-int-to-pointer-cast

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 54de56f8f3c9c40c3bc0891c01772cedbd804a7a..075ff714c523f30013ff0d871c23287d4b4864bc 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2016-10-03  Bernd Edlinger  <bernd.edlinger@hotmail.de>
+
+       * c-c++-common/Wint-in-bool-context.c: Update test.
+
 2016-10-02  Jakub Jelinek  <jakub@redhat.com>
 
        * g++.dg/ext/asm3.C (two): Only use register keyword for C++14 and

diff --git a/gcc/testsuite/c-c++-common/Wint-in-bool-context.c b/gcc/testsuite/c-c++-common/Wint-in-bool-context.c
index 38832d78f2f98db07c81b7fa1eb9cf17eedeb994..832eb0a0ee37ca064a3771b034bf779338e2a6d3 100644 (file)
--- a/gcc/testsuite/c-c++-common/Wint-in-bool-context.c
+++ b/gcc/testsuite/c-c++-common/Wint-in-bool-context.c
@@ -25,5 +25,7 @@ int foo (int a, int b)
   if (b ? 1+1 : 1) /* { dg-warning "boolean context" } */
     return 7;
 
+  for (a = 0; 1 << a; a++); /* { dg-warning "boolean context" } */
+
   return 0;
 }