From 499b73907af6e1d35a7e6fdc93a276e563512f94 Mon Sep 17 00:00:00 2001 From: mpolacek Date: Mon, 23 Jun 2014 16:38:48 +0000 Subject: [PATCH] * c-typeck.c (parser_build_binary_op): Don't call warn_logical_not_parentheses if the RHS is TRUTH_NOT_EXPR. * c-c++-common/pr49706-2.c: New test. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@211902 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/c/ChangeLog | 5 +++++ gcc/c/c-typeck.c | 3 ++- gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/c-c++-common/pr49706-2.c | 20 ++++++++++++++++++++ 4 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/c-c++-common/pr49706-2.c diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog index cc3e5fe..0972fde 100644 --- a/gcc/c/ChangeLog +++ b/gcc/c/ChangeLog @@ -1,3 +1,8 @@ +2014-06-23 Marek Polacek + + * c-typeck.c (parser_build_binary_op): Don't call + warn_logical_not_parentheses if the RHS is TRUTH_NOT_EXPR. + 2014-06-15 Jan Hubicka * c-parser.c (c_parser_omp_threadprivate): Likewise. diff --git a/gcc/c/c-typeck.c b/gcc/c/c-typeck.c index 63bd65e..0764630 100644 --- a/gcc/c/c-typeck.c +++ b/gcc/c/c-typeck.c @@ -3402,7 +3402,8 @@ parser_build_binary_op (location_t location, enum tree_code code, code1, arg1.value, code2, arg2.value); if (warn_logical_not_paren - && code1 == TRUTH_NOT_EXPR) + && code1 == TRUTH_NOT_EXPR + && code2 != TRUTH_NOT_EXPR) warn_logical_not_parentheses (location, code, arg1.value, arg2.value); /* Warn about comparisons against string literals, with the exception diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 33aa8d2..d623f6e 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2014-06-23 Marek Polacek + + * c-c++-common/pr49706-2.c: New test. + 2014-06-23 Alan Modra * gcc.dg/pr61583.c: New. diff --git a/gcc/testsuite/c-c++-common/pr49706-2.c b/gcc/testsuite/c-c++-common/pr49706-2.c new file mode 100644 index 0000000..09cc9eb --- /dev/null +++ b/gcc/testsuite/c-c++-common/pr49706-2.c @@ -0,0 +1,20 @@ +/* { dg-do compile } */ +/* { dg-options "-Wlogical-not-parentheses" } */ + +/* Test that we don't warn if both operands of the comparison + are negated. */ + +#ifndef __cplusplus +#define bool _Bool +#endif + +bool r; + +int +same (int a, int b) +{ + r = !a == !b; + r = !!a == !!b; + r = !!a == !b; + r = !a == !!b; +} -- 2.7.4