aboutsummaryrefslogtreecommitdiff
path: root/gcc/c
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/c')
-rw-r--r--gcc/c/ChangeLog5
-rw-r--r--gcc/c/c-typeck.c10
2 files changed, 5 insertions, 10 deletions
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)))
{