re PR c/77292 (Spurious warning: logical not is only applied to the left hand side...

	PR c/77292
	* c-common.c (warn_logical_not_parentheses): Don't warn for
	a comparison or a logical operator.

	* c-c++-common/Wlogical-not-parentheses-1.c: New test.

From-SVN: r239833

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 07be3bbd5b005d37e18d4fc0c6ababd190ef2c49..2a38deb1666e5e66150245f7c9f0d9bd59cbe81a 100644 (file)
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,9 @@
+2016-08-29  Marek Polacek  <polacek@redhat.com>
+
+       PR c/77292
+       * c-common.c (warn_logical_not_parentheses): Don't warn for
+       a comparison or a logical operator.
+
 2016-08-29  Tom de Vries  <tom@codesourcery.com>
 
        * c-common.c (build_va_arg): Fix type comparison assert.

diff --git a/gcc/c-family/c-common.c b/gcc/c-family/c-common.c
index 00f19ff24ef56c2638daefa4e713cb5dc8449c1f..b29334ad9af2f3fd43eff20c07c4415fab4dc58d 100644 (file)
--- a/gcc/c-family/c-common.c
+++ b/gcc/c-family/c-common.c
@@ -1481,7 +1481,8 @@ warn_tautological_cmp (location_t loc, enum tree_code code, tree lhs, tree rhs)
 
 /* Warn about logical not used on the left hand side operand of a comparison.
    This function assumes that the LHS is inside of TRUTH_NOT_EXPR.
-   Do not warn if RHS is of a boolean type.  */
+   Do not warn if RHS is of a boolean type, a logical operator, or
+   a comparison.  */
 
 void
 warn_logical_not_parentheses (location_t location, enum tree_code code,
@@ -1489,7 +1490,8 @@ warn_logical_not_parentheses (location_t location, enum tree_code code,
 {
   if (TREE_CODE_CLASS (code) != tcc_comparison
       || TREE_TYPE (rhs) == NULL_TREE
-      || TREE_CODE (TREE_TYPE (rhs)) == BOOLEAN_TYPE)
+      || TREE_CODE (TREE_TYPE (rhs)) == BOOLEAN_TYPE
+      || truth_value_p (TREE_CODE (rhs)))
     return;
 
   /* Don't warn for !x == 0 or !y != 0, those are equivalent to

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 577df5111b15e83485535f98c6c3fccb2efce53f..3aed281761d3253a5b25598d4a52622afc9e881d 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-08-29  Marek Polacek  <polacek@redhat.com>
+
+       PR c/77292
+       * c-c++-common/Wlogical-not-parentheses-1.c: New test.
+
 2016-08-29  Tom de Vries  <tom@codesourcery.com>
 
        PR c/77398

diff --git a/gcc/testsuite/c-c++-common/Wlogical-not-parentheses-1.c b/gcc/testsuite/c-c++-common/Wlogical-not-parentheses-1.c
new file mode 100644 (file)
index 0000000..b6b4e9d
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/Wlogical-not-parentheses-1.c
@@ -0,0 +1,26 @@
+/* PR c/77292 */
+/* { dg-do compile } */
+/* { dg-options "-Wlogical-not-parentheses" } */
+
+ /* Test that we don't warn if rhs is a comparison or a logical op.  */
+
+int
+foo (int a, int b)
+{
+  int r = 0;
+  r += !a == (a < b);
+  r += !a == (a > b);
+  r += !a == (a >= b);
+  r += !a == (a <= b);
+  r += !a == (a != b);
+  r += !a == (a == b);
+  r += !a == (a || b);
+  r += !a == (a && b);
+  r += !a == (!b);
+
+  r += !a == (a ^ b); /* { dg-warning "logical not is only applied to the left hand side of comparison" } */
+  r += !a == (a | b); /* { dg-warning "logical not is only applied to the left hand side of comparison" } */
+  r += !a == (a & b); /* { dg-warning "logical not is only applied to the left hand side of comparison" } */
+
+  return r;
+}