PR tree-optimization/83603 - ICE in builtin_memref at gcc/gimple-ssa-warn-restrict...

gcc/ChangeLog:

	PR tree-optimization/83603
	* calls.c (maybe_warn_nonstring_arg): Avoid accessing function
	arguments past the endof the argument list in functions declared
	without a prototype.
	* gimple-ssa-warn-restrict.c (wrestrict_dom_walker::check_call):
	Avoid checking when arguments are null.

gcc/testsuite/ChangeLog:

	PR tree-optimization/83603
	* gcc.dg/Wrestrict-4.c: New test.

From-SVN: r256217

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8a905da7edc0bdf018d0800bfc7f0337a2c30cac..78c30df536480b1898398e9366485c28a6dff078 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -553,6 +553,15 @@
        * final.c (rest_of_handle_final): Call delete_vta_debug_insns
        instead of variable_tracking_main.
 
+2018-01-03  Martin Sebor  <msebor@redhat.com>
+
+       PR tree-optimization/83603
+       * calls.c (maybe_warn_nonstring_arg): Avoid accessing function
+       arguments past the endof the argument list in functions declared
+       without a prototype.
+       * gimple-ssa-warn-restrict.c (wrestrict_dom_walker::check_call):
+       Avoid checking when arguments are null.
+
 2018-01-03  Martin Sebor  <msebor@redhat.com>
 
        PR c/83559

diff --git a/gcc/calls.c b/gcc/calls.c
index bdd49914fb27eab43f78752f0735a6be90f9236f..54fea1586312e06d49e9ea2b858e92e831f76780 100644 (file)
--- a/gcc/calls.c
+++ b/gcc/calls.c
@@ -1607,6 +1607,8 @@ maybe_warn_nonstring_arg (tree fndecl, tree exp)
 
   bool with_bounds = CALL_WITH_BOUNDS_P (exp);
 
+  unsigned nargs = call_expr_nargs (exp);
+
   /* The bound argument to a bounded string function like strncpy.  */
   tree bound = NULL_TREE;
 
@@ -1621,12 +1623,20 @@ maybe_warn_nonstring_arg (tree fndecl, tree exp)
     case BUILT_IN_STRNCASECMP:
     case BUILT_IN_STRNCPY:
     case BUILT_IN_STRNCPY_CHK:
-      bound = CALL_EXPR_ARG (exp, with_bounds ? 4 : 2);
-      break;
+      {
+       unsigned argno = with_bounds ? 4 : 2;
+       if (argno < nargs)
+         bound = CALL_EXPR_ARG (exp, argno);
+       break;
+      }
 
     case BUILT_IN_STRNDUP:
-      bound = CALL_EXPR_ARG (exp, with_bounds ? 2 : 1);
-      break;
+      {
+       unsigned argno = with_bounds ? 2 : 1;
+       if (argno < nargs)
+         bound = CALL_EXPR_ARG (exp, argno);
+       break;
+      }
 
     default:
       break;
@@ -1646,6 +1656,11 @@ maybe_warn_nonstring_arg (tree fndecl, tree exp)
 
   for (unsigned argno = 0; ; ++argno, function_args_iter_next (&it))
     {
+      /* Avoid iterating past the declared argument in a call
+        to function declared without a prototype.  */
+      if (argno >= nargs)
+       break;
+
       tree argtype = function_args_iter_cond (&it);
       if (!argtype)
        break;

diff --git a/gcc/gimple-ssa-warn-restrict.c b/gcc/gimple-ssa-warn-restrict.c
index 8bae73dd42b63785d60faa3796e7e9135f8f67a1..97d2af75531c276ab7e0cee237fa30da4f625e65 100644 (file)
--- a/gcc/gimple-ssa-warn-restrict.c
+++ b/gcc/gimple-ssa-warn-restrict.c
@@ -1691,7 +1691,9 @@ wrestrict_dom_walker::check_call (gcall *call)
   if (!dstwr && strfun)
     dstwr = size_one_node;
 
-  if (check_bounds_or_overlap (call, dst, src, dstwr, NULL_TREE))
+  /* DST and SRC can be null for a call with an insufficient number
+     of arguments to a built-in function declared without a protype.  */
+  if (!dst || !src || check_bounds_or_overlap (call, dst, src, dstwr, NULL_TREE))
     return;
 
   /* Avoid diagnosing the call again.  */

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2003706744e7e70a5e524d261eae3b9ccde16519..a5779f7498262fd7f90092abfc5d27ff055879fd 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -21,6 +21,9 @@
 
 2018-01-03  Martin Sebor  <msebor@redhat.com>
 
+       PR tree-optimization/83603
+       * gcc.dg/Wrestrict-4.c: New test.
+
        PR c/83559
        * gcc.dg/const-2.c: New test.
        * gcc.dg/pure-3.c: New test.

diff --git a/gcc/testsuite/gcc.dg/Wrestrict-4.c b/gcc/testsuite/gcc.dg/Wrestrict-4.c
new file mode 100644 (file)
index 0000000..f2398ef
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/Wrestrict-4.c
@@ -0,0 +1,110 @@
+/* PR tree-optimization/83603 - ICE in builtin_memref at
+   gcc/gimple-ssa-warn-restrict.c:238
+   Test to verify that invalid calls to built-in functions declared
+   without a prototype don't cause an ICE.
+   { dg-do compile }
+   { dg-options "-O2 -Warray-bounds -Wrestrict" } */
+
+void* memcpy ();
+void* memmove ();
+char* stpcpy ();
+char* strcat ();
+char* strcpy ();
+char* strncat ();
+char* strncpy ();
+
+void* test_memcpy_0 ()
+{
+  return memcpy ();
+}
+
+void* test_memcpy_1 (void *d)
+{
+  return memcpy (d);
+}
+
+void* test_memcpy_2 (void *d, const void *s)
+{
+  return memcpy (d, s);
+}
+
+
+void* test_memmove_0 ()
+{
+  return memmove ();
+}
+
+void* test_memmove_1 (void *d)
+{
+  return memmove (d);
+}
+
+void* test_memmove_2 (void *d, const void *s)
+{
+  return memmove (d, s);
+}
+
+
+void* test_stpcpy_0 ()
+{
+  return stpcpy ();
+}
+
+void* test_stpcpy_1 (char *d)
+{
+  return stpcpy (d);
+}
+
+
+char* test_strcat_0 ()
+{
+  return strcat ();
+}
+
+char* test_strcat_1 (char *d)
+{
+  return strcat (d);
+}
+
+
+void* test_strcpy_0 ()
+{
+  return strcpy ();
+}
+
+void* test_strcpy_1 (char *d)
+{
+  return strcpy (d);
+}
+
+
+char* test_strncat_0 ()
+{
+  return strncat ();
+}
+
+char* test_strncat_1 (char *d)
+{
+  return strncat (d);
+}
+
+char* test_strncat_2 (char *d, const char *s)
+{
+  return strncat (d, s);
+}
+
+
+void* test_strncpy_0 ()
+{
+  return strncpy ();
+}
+
+void* test_strncpy_1 (char *d)
+{
+  return strncpy (d);
+}
+
+void* test_strncpy_2 (char *d, const char *s)
+{
+  return strncpy (d, s);
+}