cp:

	* call.c (build_over_call), typeck.c (build_function_call): Call
	check_function_arguments instead of check_function_format.

testsuite:
	* g++.dg/warn/nonnull1.C: New test.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@83937 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 4174c40..4d15664 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,10 @@
 2004-06-30  Joseph S. Myers  <jsm@polyomino.org.uk>
 
+       * call.c (build_over_call), typeck.c (build_function_call): Call
+       check_function_arguments instead of check_function_format.
+
+2004-06-30  Joseph S. Myers  <jsm@polyomino.org.uk>
+
        * call.c (build_over_call), typeck.c (build_function_call): Update
        calls to check_function_format.
 

diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 290fd6b..76f0291 100644 (file)
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -4723,9 +4723,8 @@ build_over_call (struct z_candidate *cand, int flags)
 
   converted_args = nreverse (converted_args);
 
-  if (warn_format)
-    check_function_format (TYPE_ATTRIBUTES (TREE_TYPE (fn)),
-                          converted_args);
+  check_function_arguments (TYPE_ATTRIBUTES (TREE_TYPE (fn)),
+                           converted_args);
 
   /* Avoid actually calling copy constructors and copy assignment operators,
      if possible.  */

diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index 1dfb337..d099980 100644 (file)
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -2483,10 +2483,10 @@ build_function_call (tree function, tree params)
   if (coerced_params == error_mark_node)
     return error_mark_node;
 
-  /* Check for errors in format strings.  */
+  /* Check for errors in format strings and inappropriately
+     null parameters.  */
 
-  if (warn_format)
-    check_function_format (TYPE_ATTRIBUTES (fntype), coerced_params);
+  check_function_arguments (TYPE_ATTRIBUTES (fntype), coerced_params);
 
   return build_cxx_call (function, coerced_params);
 }

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 69d8c19..b08ec7d 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-30  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+       * g++.dg/warn/nonnull1.C: New test.
+
 2004-06-30  Eric Botcazou  <ebotcazou@libertysurf.fr>
 
        * gcc.dg/compat/compat-common.h: Wrap up CINT in

diff --git a/gcc/testsuite/g++.dg/warn/nonnull1.C b/gcc/testsuite/g++.dg/warn/nonnull1.C
new file mode 100644 (file)
index 0000000..46de7e9
--- /dev/null
+++ b/gcc/testsuite/g++.dg/warn/nonnull1.C
@@ -0,0 +1,16 @@
+// Test that "nonnull" attribute works for C++.
+// Origin: Joseph Myers <jsm@polyomino.org.uk>
+// { dg-do compile }
+// { dg-options "-Wall" }
+
+// The "nonnull" attribute is thoroughly tested for C, so here we
+// simply test that it works at all, as at one point the relevant
+// checking code was only called for C.
+
+extern void f (char *) __attribute__((nonnull));
+
+void
+g ()
+{
+  f (0); // { dg-warning "null" "null argument" }
+}