From patchwork Wed Aug 24 17:43:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marek Polacek X-Patchwork-Id: 662418 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sKF6S61v6z9sxb for ; Thu, 25 Aug 2016 03:44:00 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=Sv4K9euO; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:subject:message-id:mime-version:content-type :content-transfer-encoding; q=dns; s=default; b=KLFWBaWWr5UhygOw Hx1OhyrrYY/ASvFozFUR2oyPR5mubPUmJQNPvuImmFMWZ5A4jDbsi2w7SaCwqB26 rZT0Sf1NDoc6F+9BuvBbZe7IYyG81W67RU7Syk8SAJA79s45X7t9M2aQbxcVdoG8 +fc9CeZ0z0GfVWhbe4TmY7sAxd0= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:subject:message-id:mime-version:content-type :content-transfer-encoding; s=default; bh=gcQCvul/R9065o7ukVLGbY f9nrY=; b=Sv4K9euOxbgmt7tqHhK1J6N6H/owXQa/jP5Flutk7FZQmUxUQKCxZn N4Xv3cDzrnqtUUJdjqIbDKM7IhjIyqPqfQ8iyumB6BC0rnTbnsg6mUlM18N1Zmmz r/R86PoNfTU/O9oiHYsWUb36w/8Vii9G5RkXg437BuKRsb4uLKm5g= Received: (qmail 47643 invoked by alias); 24 Aug 2016 17:43:52 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 47634 invoked by uid 89); 24 Aug 2016 17:43:52 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.1 required=5.0 tests=BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=richloc, UD:c-typeck.c, c-typeck.c, ctypeckc X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 24 Aug 2016 17:43:50 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 51CBB19D38D for ; Wed, 24 Aug 2016 17:43:49 +0000 (UTC) Received: from redhat.com (ovpn-204-109.brq.redhat.com [10.40.204.109]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u7OHhkFG013820 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Wed, 24 Aug 2016 13:43:48 -0400 Date: Wed, 24 Aug 2016 19:43:46 +0200 From: Marek Polacek To: GCC Patches Subject: Add fixit hint for -Wlogical-not-parentheses Message-ID: <20160824174346.GK11131@redhat.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.6.2 (2016-07-01) This patch adds a fixit hint to -Wlogical-not-parentheses. When the LHS has a location, it prints: z.c: In function ‘int foo(int, int)’: z.c:12:11: warning: logical not is only applied to the left hand side of comparison [-Wlogical-not-parentheses] r += !a == b; ^~ z.c:12:8: note: add parentheses around left hand side expression to silence this warning r += !a == b; ^~ ( ) Bootstrapped/regtested on x86_64-linux and ppc64le-redhat-linux, ok for trunk? 2016-08-24 Marek Polacek * c-common.c (warn_logical_not_parentheses): Print fixit hints. * c-common.h (warn_logical_not_parentheses): Update declaration. * c-typeck.c (parser_build_binary_op): Pass LHS to warn_logical_not_parentheses. * parser.c (cp_parser_binary_expression): Pass LHS to warn_logical_not_parentheses. * c-c++-common/Wlogical-not-parentheses-2.c: New test. Marek diff --git gcc/c-family/c-common.c gcc/c-family/c-common.c index 3feb910..a445df1 100644 --- gcc/c-family/c-common.c +++ gcc/c-family/c-common.c @@ -1485,7 +1485,7 @@ warn_tautological_cmp (location_t loc, enum tree_code code, tree lhs, tree rhs) void warn_logical_not_parentheses (location_t location, enum tree_code code, - tree rhs) + tree lhs, tree rhs) { if (TREE_CODE_CLASS (code) != tcc_comparison || TREE_TYPE (rhs) == NULL_TREE @@ -1498,9 +1498,16 @@ warn_logical_not_parentheses (location_t location, enum tree_code code, && integer_zerop (rhs)) return; - warning_at (location, OPT_Wlogical_not_parentheses, - "logical not is only applied to the left hand side of " - "comparison"); + if (warning_at (location, OPT_Wlogical_not_parentheses, + "logical not is only applied to the left hand side of " + "comparison") + && EXPR_HAS_LOCATION (lhs)) + { + rich_location richloc (line_table, EXPR_LOCATION (lhs)); + richloc.add_fixit_insert (EXPR_LOCATION (lhs), "( )"); + inform_at_rich_loc (&richloc, "add parentheses around left hand side " + "expression to silence this warning"); + } } /* Warn if EXP contains any computations whose results are not used. diff --git gcc/c-family/c-common.h gcc/c-family/c-common.h index bc22baa..42ce969 100644 --- gcc/c-family/c-common.h +++ gcc/c-family/c-common.h @@ -847,7 +847,8 @@ extern void overflow_warning (location_t, tree); extern bool warn_if_unused_value (const_tree, location_t); extern void warn_logical_operator (location_t, enum tree_code, tree, enum tree_code, tree, enum tree_code, tree); -extern void warn_logical_not_parentheses (location_t, enum tree_code, tree); +extern void warn_logical_not_parentheses (location_t, enum tree_code, tree, + tree); extern void warn_tautological_cmp (location_t, enum tree_code, tree, tree); extern void check_main_parameter_types (tree decl); extern bool c_determine_visibility (tree); diff --git gcc/c/c-typeck.c gcc/c/c-typeck.c index bc8728a..2f8d611 100644 --- gcc/c/c-typeck.c +++ gcc/c/c-typeck.c @@ -3696,7 +3696,7 @@ parser_build_binary_op (location_t location, enum tree_code code, while (1); } if (TREE_CODE (TREE_TYPE (t)) != BOOLEAN_TYPE) - warn_logical_not_parentheses (location, code, arg2.value); + warn_logical_not_parentheses (location, code, arg1.value, arg2.value); } /* Warn about comparisons against string literals, with the exception diff --git gcc/cp/parser.c gcc/cp/parser.c index 690e928..d54cf8a 100644 --- gcc/cp/parser.c +++ gcc/cp/parser.c @@ -8922,7 +8922,7 @@ cp_parser_binary_expression (cp_parser* parser, bool cast_p, || TREE_TYPE (current.lhs) == NULL_TREE || TREE_CODE (TREE_TYPE (current.lhs)) != BOOLEAN_TYPE)) warn_logical_not_parentheses (current.loc, current.tree_type, - maybe_constant_value (rhs)); + current.lhs, maybe_constant_value (rhs)); overload = NULL; diff --git gcc/testsuite/c-c++-common/Wlogical-not-parentheses-2.c gcc/testsuite/c-c++-common/Wlogical-not-parentheses-2.c index e69de29..c5c2aac 100644 --- gcc/testsuite/c-c++-common/Wlogical-not-parentheses-2.c +++ gcc/testsuite/c-c++-common/Wlogical-not-parentheses-2.c @@ -0,0 +1,20 @@ +/* { dg-do compile } */ +/* { dg-options "-Wlogical-not-parentheses -fdiagnostics-show-caret" } */ + + /* Test fixit hints. */ + +int +foo (int a, int b) +{ + int r = 0; + r += (!a) == b; + r += !a == b; /* { dg-warning "logical not is only applied" } */ +/* { dg-begin-multiline-output "" } + r += !a == b; + ^~ + r += !a == b; + ^~ + ( ) + { dg-end-multiline-output "" } */ + return r; +}