backport: re PR c++/86210 (Missing -Wnonnull warning for function defined in the...

	Backported from mainline
	2018-06-20  Jakub Jelinek  <jakub@redhat.com>

	PR c++/86210
	* c-common.c (check_nonnull_arg): Use fold_for_warn.  Adjust obsolete
	comment.

	* g++.dg/warn/Wnonnull4.C: New test.

From-SVN: r262102

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index c9f7773022d823339dba427e78ce80bf65e3d0b5..7ff31517eadc9d37f47e8781157acca3a9bf74f3 100644 (file)
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,6 +1,12 @@
 2018-06-25  Jakub Jelinek  <jakub@redhat.com>
 
        Backported from mainline
+       2018-06-20  Jakub Jelinek  <jakub@redhat.com>
+
+       PR c++/86210
+       * c-common.c (check_nonnull_arg): Use fold_for_warn.  Adjust obsolete
+       comment.
+
        2017-11-21  Jakub Jelinek  <jakub@redhat.com>
 
        PR c++/83059

diff --git a/gcc/c-family/c-common.c b/gcc/c-family/c-common.c
index ad029ea6b3d2dcd7dc0edb30370485911f237235..0c353b88fc957301a5a95319ac66f97be9745e2b 100644 (file)
--- a/gcc/c-family/c-common.c
+++ b/gcc/c-family/c-common.c
@@ -9249,7 +9249,7 @@ check_nonnull_arg (void *ctx, tree param, unsigned HOST_WIDE_INT param_num)
   if (TREE_CODE (TREE_TYPE (param)) != POINTER_TYPE)
     return;
 
-  if (integer_zerop (param))
+  if (integer_zerop (fold_for_warn (param)))
     warning_at (*ploc, OPT_Wnonnull, "null argument where non-null required "
                "(argument %lu)", (unsigned long) param_num);
 }

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9621f65c96f42092547b3ce714532e62b7c24a2a..ccbbdae8d80a9a09697ca37e30892fd94e1a9d2a 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -3,6 +3,9 @@
        Backported from mainline
        2018-06-20  Jakub Jelinek  <jakub@redhat.com>
 
+       PR c++/86210
+       * g++.dg/warn/Wnonnull4.C: New test.
+
        PR tree-optimization/86231
        * gcc.dg/tree-ssa/vrp119.c: New test.
        * gcc.c-torture/execute/pr86231.c: New test.

diff --git a/gcc/testsuite/g++.dg/warn/Wnonnull4.C b/gcc/testsuite/g++.dg/warn/Wnonnull4.C
new file mode 100644 (file)
index 0000000..d07a445
--- /dev/null
+++ b/gcc/testsuite/g++.dg/warn/Wnonnull4.C
@@ -0,0 +1,21 @@
+// PR c++/86210
+// { dg-do compile }
+// { dg-options "-Wnonnull" }
+
+void *declared_not_defined (void *p) __attribute__((nonnull));
+
+inline void *declared_and_defined (void *p) __attribute__((nonnull));
+
+int
+main ()
+{
+  int *const p = 0;
+  declared_not_defined (p);    // { dg-warning "null argument where non-null required" }
+  declared_and_defined (p);    // { dg-warning "null argument where non-null required" }
+}
+
+void *
+declared_and_defined (void *p)
+{
+  return p;
+}