From patchwork Wed Sep 9 21:44:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mark Wielaard X-Patchwork-Id: 516046 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 830B0140291 for ; Thu, 10 Sep 2015 07:45:28 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=b7IdjdmS; 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:from :to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; q=dns; s=default; b=mI1IzpFFe/An5Hl/ PgAJVWorOeUOKAQl6xq3Vl37ac1Lt7PRRPrHQc74g6m8n23HDM4o+6oAL4WWMmnp kUaZk/CUDPlLkgKMCgcYas8Aco7x8Ds6kSS1MfucpSyulwaR0Ht/T1KTBzD4EfUz 89q4SRbQ9tITPePcBoAZhvgH1m4= 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:from :to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=default; bh=CeUAHXNcyaSy9q38GxgDaN dfEFU=; b=b7IdjdmS1XN6G6ksn/9VE9uN1W2qZ6lF5feh5NF+T577u8d66Wps4L Xgmhi3RHDGWo/9Rk67M93i1DbZa8k56aF2Ids8705cSTtAXAKCqbXvVhmYb8oIvx HADh+bJIJVywEy+di1cx4FYIfoqyVNDrY6OwxOgvrVVRtEbUTj7Bs= Received: (qmail 86607 invoked by alias); 9 Sep 2015 21:45:21 -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 86557 invoked by uid 89); 9 Sep 2015 21:45:19 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.9 required=5.0 tests=AWL, BAYES_20, SPF_PASS autolearn=ham version=3.3.2 X-HELO: gnu.wildebeest.org Received: from wildebeest.demon.nl (HELO gnu.wildebeest.org) (212.238.236.112) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Wed, 09 Sep 2015 21:45:17 +0000 From: Mark Wielaard To: gcc-patches@gcc.gnu.org Cc: Mark Wielaard Subject: [PATCH] Warn when comparing nonnull arguments to NULL in a function. Date: Wed, 9 Sep 2015 23:44:47 +0200 Message-Id: <1441835087-14555-1-git-send-email-mjw@redhat.com> MIME-Version: 1.0 X-Spam-Score: -2.9 (--) The following found 14 bugs in my code base. I think it is useful to warn about such usage since they are bugsr. If the argument is marked as nonnull then passing in a NULL argument will produce bad results even if the code checks against NULL. GCC might optimize such checks away so warn the user when the function contains such comparisions. nn.c: In function ‘foo’: nn.c:6:27: warning: nonnull argument ‘bar’ compared to NULL [-Wnonnull] void foo(void *bar) { if (!bar) abort(); } ^ gcc/c/ChangeLog * c-typeck.c (build_binary_op): Check and warn when nonnull arg parm against NULL. gcc/cp/ChangeLog * typeck.c (cp_build_binary_op): Check and warn when nonnull arg parm against NULL. gcc/testsuite/ChangeLog * gcc.dg/nonnull-4.c: New test. * g++.dg/warn/nonnull3.C: Likewise. --- gcc/c/ChangeLog | 5 +++++ gcc/c/c-typeck.c | 10 ++++++++++ gcc/cp/ChangeLog | 5 +++++ gcc/cp/typeck.c | 10 ++++++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/warn/nonnull3.C | 29 +++++++++++++++++++++++++++++ gcc/testsuite/gcc.dg/nonnull-4.c | 28 ++++++++++++++++++++++++++++ 7 files changed, 92 insertions(+) create mode 100644 gcc/testsuite/g++.dg/warn/nonnull3.C create mode 100644 gcc/testsuite/gcc.dg/nonnull-4.c diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog index d7eeb2d..35ccdda 100644 --- a/gcc/c/ChangeLog +++ b/gcc/c/ChangeLog @@ -1,3 +1,8 @@ +2015-09-09 Mark Wielaard + + * c-typeck.c (build_binary_op): Check and warn when nonnull arg + parm against NULL. + 2015-09-09 Jakub Jelinek PR c/67501 diff --git a/gcc/c/c-typeck.c b/gcc/c/c-typeck.c index dc22396..4108f27 100644 --- a/gcc/c/c-typeck.c +++ b/gcc/c/c-typeck.c @@ -10803,6 +10803,11 @@ build_binary_op (location_t location, enum tree_code code, short_compare = 1; else if (code0 == POINTER_TYPE && null_pointer_constant_p (orig_op1)) { + if (warn_nonnull + && TREE_CODE (op0) == PARM_DECL && nonnull_arg_p (op0)) + warning_at (location, OPT_Wnonnull, + "nonnull argument %qD compared to NULL", op0); + if (TREE_CODE (op0) == ADDR_EXPR && decl_with_nonnull_addr_p (TREE_OPERAND (op0, 0))) { @@ -10823,6 +10828,11 @@ build_binary_op (location_t location, enum tree_code code, } else if (code1 == POINTER_TYPE && null_pointer_constant_p (orig_op0)) { + if (warn_nonnull + && TREE_CODE (op1) == PARM_DECL && nonnull_arg_p (op1)) + warning_at (location, OPT_Wnonnull, + "nonnull argument %qD compared to NULL", op1); + if (TREE_CODE (op1) == ADDR_EXPR && decl_with_nonnull_addr_p (TREE_OPERAND (op1, 0))) { diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 515a1e8..7cf0064 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2015-09-09 Mark Wielaard + + * typeck.c (cp_build_binary_op): Check and warn when nonnull arg + parm against NULL. + 2015-09-09 Jakub Jelinek PR c++/67504 diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index 388558c..482e42c 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -4438,6 +4438,11 @@ cp_build_binary_op (location_t location, || (code0 == POINTER_TYPE && TYPE_PTR_P (type1) && integer_zerop (op1))) { + if (warn_nonnull + && TREE_CODE (op0) == PARM_DECL && nonnull_arg_p (op0)) + warning_at (location, OPT_Wnonnull, + "nonnull argument %qD compared to NULL", op0); + if (TYPE_PTR_P (type1)) result_type = composite_pointer_type (type0, type1, op0, op1, CPO_COMPARISON, complain); @@ -4477,6 +4482,11 @@ cp_build_binary_op (location_t location, || (code1 == POINTER_TYPE && TYPE_PTR_P (type0) && integer_zerop (op0))) { + if (warn_nonnull + && TREE_CODE (op1) == PARM_DECL && nonnull_arg_p (op1)) + warning_at (location, OPT_Wnonnull, + "nonnull argument %qD compared to NULL", op1); + if (TYPE_PTR_P (type0)) result_type = composite_pointer_type (type0, type1, op0, op1, CPO_COMPARISON, complain); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 360fe70..be4abd0 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2015-09-09 Mark Wielaard + + * gcc.dg/nonnull-4.c: New test. + * g++.dg/warn/nonnull3.C: Likewise. + 2015-09-09 Kyrylo Tkachov * gcc.target/aarch64/mod_2.x: New file. diff --git a/gcc/testsuite/g++.dg/warn/nonnull3.C b/gcc/testsuite/g++.dg/warn/nonnull3.C new file mode 100644 index 0000000..8cad937 --- /dev/null +++ b/gcc/testsuite/g++.dg/warn/nonnull3.C @@ -0,0 +1,29 @@ +/* Test for the bad usage of "nonnull" function attribute parms. */ +/* Same as C test gcc.dg/nonnull-4.c because checks are done in frontend. */ +/* */ +/* { dg-do compile } */ +/* { dg-options "-Wnonnull" } */ + +#include +#include + +void foo(void *bar) __attribute__((nonnull(1))); + +void foo(void *bar) { if (!bar) abort(); } /* { dg-warning "null" "argument ‘bar’ compared to NULL" } */ + +extern int func (char *, char *, char *, char *) __attribute__((nonnull)); + +int +func (char *cp1, char *cp2, char *cp3, char *cp4) +{ + if (cp1) /* { dg-warning "nonnull argument" "cp1 compared to NULL" } */ + return 1; + + if (cp2 == NULL) /* { dg-warning "nonnull argument" "cp1 compared to NULL" } */ + return 2; + + if (NULL != cp3) /* { dg-warning "nonnull argument" "cp1 compared to NULL" } */ + return 3; + + return (cp4 != 0) ? 0 : 1; /* { dg-warning "nonnull argument" "cp1 compared to NULL" } */ +} diff --git a/gcc/testsuite/gcc.dg/nonnull-4.c b/gcc/testsuite/gcc.dg/nonnull-4.c new file mode 100644 index 0000000..12f9356 --- /dev/null +++ b/gcc/testsuite/gcc.dg/nonnull-4.c @@ -0,0 +1,28 @@ +/* Test for the bad usage of "nonnull" function attribute parms. */ +/* */ +/* { dg-do compile } */ +/* { dg-options "-Wnonnull" } */ + +#include +#include + +void foo(void *bar) __attribute__((nonnull(1))); + +void foo(void *bar) { if (!bar) abort(); } /* { dg-warning "null" "argument ‘bar’ compared to NULL" } */ + +extern int func (char *, char *, char *, char *) __attribute__((nonnull)); + +int +func (char *cp1, char *cp2, char *cp3, char *cp4) +{ + if (cp1) /* { dg-warning "nonnull argument" "cp1 compared to NULL" } */ + return 1; + + if (cp2 == NULL) /* { dg-warning "nonnull argument" "cp1 compared to NULL" } */ + return 2; + + if (NULL != cp3) /* { dg-warning "nonnull argument" "cp1 compared to NULL" } */ + return 3; + + return (cp4 != 0) ? 0 : 1; /* { dg-warning "nonnull argument" "cp1 compared to NULL" } */ +}