aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog12
-rw-r--r--gcc/Makefile.in1
-rw-r--r--gcc/c-family/ChangeLog5
-rw-r--r--gcc/c-family/c.opt4
-rw-r--r--gcc/c/ChangeLog5
-rw-r--r--gcc/c/c-typeck.c10
-rw-r--r--gcc/common.opt4
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/typeck.c10
-rw-r--r--gcc/doc/invoke.texi16
-rw-r--r--gcc/gimple-ssa-nonnull-compare.c151
-rw-r--r--gcc/passes.def1
-rw-r--r--gcc/testsuite/ChangeLog7
-rw-r--r--gcc/testsuite/c-c++-common/nonnull-1.c2
-rw-r--r--gcc/testsuite/c-c++-common/nonnull-2.c26
-rw-r--r--gcc/tree-pass.h1
16 files changed, 235 insertions, 25 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0689226..29302b0 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,15 @@
+2016-02-16 Jakub Jelinek <jakub@redhat.com>
+
+ PR c/69835
+ * common.opt (Wnonnull-compare): New warning.
+ * doc/invoke.texi (-Wnonnull): Remove text about comparison
+ of arguments against NULL.
+ (-Wnonnull-compare): Document.
+ * Makefile.in (OBJS): Add gimple-ssa-nonnull-compare.o.
+ * tree-pass.h (make_pass_warn_nonnull_compare): Declare.
+ * passes.def (pass_warn_nonnull_compare): Add.
+ * gimple-ssa-nonnull-compare.c: New file.
+
2016-02-16 James Greenhalgh <james.greenhalgh@arm.com>
* config/aarch64/aarch64.c (cortexa57_tunings): Remove
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 6c15830..3d6f0e6 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -1278,6 +1278,7 @@ OBJS = \
gimple-pretty-print.o \
gimple-ssa-backprop.o \
gimple-ssa-isolate-paths.o \
+ gimple-ssa-nonnull-compare.o \
gimple-ssa-split-paths.o \
gimple-ssa-strength-reduction.o \
gimple-streamer-in.o \
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 3e5a68b..aca8cc2 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,8 @@
+2016-02-16 Jakub Jelinek <jakub@redhat.com>
+
+ PR c/69835
+ * c.opt (Wnonnull-compare): Enable for -Wall.
+
2016-02-15 Jakub Jelinek <jakub@redhat.com>
PR c++/69797
diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt
index b4ec3b8..638e9c24 100644
--- a/gcc/c-family/c.opt
+++ b/gcc/c-family/c.opt
@@ -677,6 +677,10 @@ Wnonnull
C ObjC C++ ObjC++ LangEnabledBy(C ObjC C++ ObjC++,Wall)
;
+Wnonnull-compare
+C ObjC C++ ObjC++ LangEnabledBy(C ObjC C++ ObjC++,Wall)
+;
+
Wnormalized
C ObjC C++ ObjC++ Warning Alias(Wnormalized=,nfc,none)
;
diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index b51957e..ae00338 100644
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,8 @@
+2016-02-16 Jakub Jelinek <jakub@redhat.com>
+
+ PR c/69835
+ * c-typeck.c (build_binary_op): Revert 2015-09-09 change.
+
2016-02-16 James Norris <jnorris@codesourcery.com>
PR c/64748
diff --git a/gcc/c/c-typeck.c b/gcc/c/c-typeck.c
index 1122a88..6aa0f03 100644
--- a/gcc/c/c-typeck.c
+++ b/gcc/c/c-typeck.c
@@ -11086,11 +11086,6 @@ 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)))
{
@@ -11111,11 +11106,6 @@ 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/common.opt b/gcc/common.opt
index 520fa9c..3c3669a 100644
--- a/gcc/common.opt
+++ b/gcc/common.opt
@@ -616,6 +616,10 @@ Wlarger-than=
Common RejectNegative Joined UInteger Warning
-Wlarger-than=<number> Warn if an object is larger than <number> bytes.
+Wnonnull-compare
+Var(warn_nonnull_compare) Warning
+Warn if comparing pointer parameter with nonnull attribute with NULL.
+
Wnull-dereference
Common Var(warn_null_dereference) Warning
Warn if dereferencing a NULL pointer may lead to erroneous or undefined behavior.
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 90c76ff..d12cb73 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2016-02-16 Jakub Jelinek <jakub@redhat.com>
+
+ PR c/69835
+ * typeck.c (cp_build_binary_op): Revert 2015-09-09 change.
+
2016-02-16 Jason Merrill <jason@redhat.com>
PR c++/69657
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index acedab8..5e62220 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -4514,11 +4514,6 @@ 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);
@@ -4558,11 +4553,6 @@ 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/doc/invoke.texi b/gcc/doc/invoke.texi
index 85f2221..2bd793d 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -276,7 +276,8 @@ Objective-C and Objective-C++ Dialects}.
-Wmain -Wmaybe-uninitialized -Wmemset-transposed-args @gol
-Wmisleading-indentation -Wmissing-braces @gol
-Wmissing-field-initializers -Wmissing-include-dirs @gol
--Wno-multichar -Wnonnull -Wnormalized=@r{[}none@r{|}id@r{|}nfc@r{|}nfkc@r{]} @gol
+-Wno-multichar -Wnonnull -Wnonnull-compare @gol
+-Wnormalized=@r{[}none@r{|}id@r{|}nfc@r{|}nfkc@r{]} @gol
-Wnull-dereference -Wodr -Wno-overflow -Wopenmp-simd @gol
-Woverride-init-side-effects -Woverlength-strings @gol
-Wpacked -Wpacked-bitfield-compat -Wpadded @gol
@@ -3537,6 +3538,7 @@ Options} and @ref{Objective-C and Objective-C++ Dialect Options}.
-Wmissing-braces @r{(only for C/ObjC)} @gol
-Wnarrowing @r{(only for C++)} @gol
-Wnonnull @gol
+-Wnonnull-compare @gol
-Wopenmp-simd @gol
-Wparentheses @gol
-Wpointer-sign @gol
@@ -3795,12 +3797,18 @@ formats that may yield only a two-digit year.
Warn about passing a null pointer for arguments marked as
requiring a non-null value by the @code{nonnull} function attribute.
-Also warns when comparing an argument marked with the @code{nonnull}
-function attribute against null inside the function.
-
@option{-Wnonnull} is included in @option{-Wall} and @option{-Wformat}. It
can be disabled with the @option{-Wno-nonnull} option.
+@item -Wnonnull-compare
+@opindex Wnonnull-compare
+@opindex Wno-nonnull-compare
+Warn when comparing an argument marked with the @code{nonnull}
+function attribute against null inside the function.
+
+@option{-Wnonnull-compare} is included in @option{-Wall}. It
+can be disabled with the @option{-Wno-nonnull-compare} option.
+
@item -Wnull-dereference
@opindex Wnull-dereference
@opindex Wno-null-dereference
diff --git a/gcc/gimple-ssa-nonnull-compare.c b/gcc/gimple-ssa-nonnull-compare.c
new file mode 100644
index 0000000..910188b
--- /dev/null
+++ b/gcc/gimple-ssa-nonnull-compare.c
@@ -0,0 +1,151 @@
+/* -Wnonnull-compare warning support.
+ Copyright (C) 2016 Free Software Foundation, Inc.
+ Contributed by Jakub Jelinek <jakub@redhat.com>
+
+This file is part of GCC.
+
+GCC is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3, or (at your option)
+any later version.
+
+GCC is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GCC; see the file COPYING3. If not see
+<http://www.gnu.org/licenses/>. */
+
+#include "config.h"
+#include "system.h"
+#include "coretypes.h"
+#include "backend.h"
+#include "tree.h"
+#include "gimple.h"
+#include "tree-pass.h"
+#include "ssa.h"
+#include "diagnostic-core.h"
+#include "tree-dfa.h"
+
+/* Warn about comparison of nonnull_arg_p argument initial values
+ with NULL. */
+
+static void
+do_warn_nonnull_compare (function *fun, tree arg)
+{
+ if (!POINTER_TYPE_P (TREE_TYPE (arg))
+ && TREE_CODE (TREE_TYPE (arg)) != OFFSET_TYPE)
+ return;
+
+ if (!nonnull_arg_p (arg))
+ return;
+
+ tree d = ssa_default_def (fun, arg);
+ if (d == NULL_TREE)
+ return;
+
+ use_operand_p use_p;
+ imm_use_iterator iter;
+
+ FOR_EACH_IMM_USE_FAST (use_p, iter, d)
+ {
+ gimple *stmt = USE_STMT (use_p);
+ tree op = NULL_TREE;
+ location_t loc = gimple_location (stmt);
+ if (gimple_code (stmt) == GIMPLE_COND)
+ switch (gimple_cond_code (stmt))
+ {
+ case EQ_EXPR:
+ case NE_EXPR:
+ if (gimple_cond_lhs (stmt) == d)
+ op = gimple_cond_rhs (stmt);
+ break;
+ default:
+ break;
+ }
+ else if (is_gimple_assign (stmt))
+ switch (gimple_assign_rhs_code (stmt))
+ {
+ case EQ_EXPR:
+ case NE_EXPR:
+ if (gimple_assign_rhs1 (stmt) == d)
+ op = gimple_assign_rhs2 (stmt);
+ break;
+ case COND_EXPR:
+ switch (TREE_CODE (gimple_assign_rhs1 (stmt)))
+ {
+ case EQ_EXPR:
+ case NE_EXPR:
+ op = gimple_assign_rhs1 (stmt);
+ if (TREE_OPERAND (op, 0) != d)
+ {
+ op = NULL_TREE;
+ break;
+ }
+ loc = EXPR_LOC_OR_LOC (op, loc);
+ op = TREE_OPERAND (op, 1);
+ break;
+ default:
+ break;
+ }
+ break;
+ default:
+ break;
+ }
+ if (op
+ && (POINTER_TYPE_P (TREE_TYPE (arg))
+ ? integer_zerop (op) : integer_minus_onep (op)))
+ warning_at (loc, OPT_Wnonnull_compare,
+ "nonnull argument %qD compared to NULL", arg);
+ }
+}
+
+namespace {
+
+const pass_data pass_data_warn_nonnull_compare =
+{
+ GIMPLE_PASS, /* type */
+ "*nonnullcmp", /* name */
+ OPTGROUP_NONE, /* optinfo_flags */
+ TV_NONE, /* tv_id */
+ PROP_ssa, /* properties_required */
+ 0, /* properties_provided */
+ 0, /* properties_destroyed */
+ 0, /* todo_flags_start */
+ 0, /* todo_flags_finish */
+};
+
+class pass_warn_nonnull_compare : public gimple_opt_pass
+{
+public:
+ pass_warn_nonnull_compare (gcc::context *ctxt)
+ : gimple_opt_pass (pass_data_warn_nonnull_compare, ctxt)
+ {}
+
+ /* opt_pass methods: */
+ virtual bool gate (function *) { return warn_nonnull_compare; }
+
+ virtual unsigned int execute (function *);
+
+}; // class pass_warn_nonnull_compare
+
+unsigned int
+pass_warn_nonnull_compare::execute (function *fun)
+{
+ if (fun->static_chain_decl)
+ do_warn_nonnull_compare (fun, fun->static_chain_decl);
+
+ for (tree arg = DECL_ARGUMENTS (cfun->decl); arg; arg = DECL_CHAIN (arg))
+ do_warn_nonnull_compare (fun, arg);
+ return 0;
+}
+
+} // anon namespace
+
+gimple_opt_pass *
+make_pass_warn_nonnull_compare (gcc::context *ctxt)
+{
+ return new pass_warn_nonnull_compare (ctxt);
+}
diff --git a/gcc/passes.def b/gcc/passes.def
index d103df1..7aed144 100644
--- a/gcc/passes.def
+++ b/gcc/passes.def
@@ -56,6 +56,7 @@ along with GCC; see the file COPYING3. If not see
NEXT_PASS (pass_fixup_cfg);
NEXT_PASS (pass_init_datastructures);
NEXT_PASS (pass_build_ssa);
+ NEXT_PASS (pass_warn_nonnull_compare);
NEXT_PASS (pass_ubsan);
NEXT_PASS (pass_early_warn_uninitialized);
NEXT_PASS (pass_nothrow);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index cf1da01..df0b67c 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2016-02-16 Jakub Jelinek <jakub@redhat.com>
+
+ PR c/69835
+ * c-c++-common/nonnull-1.c: Use -Wnonnull-compare instead of
+ -Wnonnull in dg-options.
+ * c-c++-common/nonnull-2.c: New test.
+
2016-02-16 James Greenhalgh <james.greenhalgh@arm.com>
Ramana Radhakrishnan <ramana.radhakrishnan@arm.com>
diff --git a/gcc/testsuite/c-c++-common/nonnull-1.c b/gcc/testsuite/c-c++-common/nonnull-1.c
index b5c3d7f..fb2814c 100644
--- a/gcc/testsuite/c-c++-common/nonnull-1.c
+++ b/gcc/testsuite/c-c++-common/nonnull-1.c
@@ -1,7 +1,7 @@
/* Test for the bad usage of "nonnull" function attribute parms. */
/* */
/* { dg-do compile } */
-/* { dg-options "-Wnonnull" } */
+/* { dg-options "-Wnonnull-compare" } */
#include <stddef.h>
#include <stdlib.h>
diff --git a/gcc/testsuite/c-c++-common/nonnull-2.c b/gcc/testsuite/c-c++-common/nonnull-2.c
new file mode 100644
index 0000000..ebd17a2
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/nonnull-2.c
@@ -0,0 +1,26 @@
+/* Test for the bad usage of "nonnull" function attribute parms. */
+/* { dg-do compile } */
+/* { dg-options "-Wnonnull-compare" } */
+
+void bar (char **);
+
+__attribute__((nonnull (1, 3))) int
+foo (char *cp1, char *cp2, char *cp3, char *cp4)
+{
+ if (cp1 == (char *) 0) /* { dg-warning "nonnull argument" "cp1 compared to NULL" } */
+ return 1;
+
+ cp1 = cp2;
+ if (cp1 == (char *) 0) /* { dg-bogus "nonnull argument" } */
+ return 2;
+
+ if (!cp4) /* { dg-bogus "nonnull argument" } */
+ return 3;
+
+ char **p = &cp3;
+ bar (p);
+ if (cp3 == (char *) 0) /* { dg-bogus "nonnull argument" } */
+ return 4;
+
+ return 5;
+}
diff --git a/gcc/tree-pass.h b/gcc/tree-pass.h
index b942a01..5f5055d 100644
--- a/gcc/tree-pass.h
+++ b/gcc/tree-pass.h
@@ -472,6 +472,7 @@ extern gimple_opt_pass *make_pass_oacc_kernels (gcc::context *ctxt);
extern simple_ipa_opt_pass *make_pass_ipa_oacc (gcc::context *ctxt);
extern simple_ipa_opt_pass *make_pass_ipa_oacc_kernels (gcc::context *ctxt);
extern gimple_opt_pass *make_pass_gen_hsail (gcc::context *ctxt);
+extern gimple_opt_pass *make_pass_warn_nonnull_compare (gcc::context *ctxt);
/* IPA Passes */
extern simple_ipa_opt_pass *make_pass_ipa_lower_emutls (gcc::context *ctxt);
generated by cgit v1.1 at 2024-11-04 20:47:57 +0000