From: Joseph Myers <joseph@codesourcery.com>
Date: Fri, 24 Oct 2008 19:22:14 +0000 (+0100)
Subject: c-typeck.c (enum impl_conv): Remove ic_argpass_nonproto.
X-Git-Tag: releases/gcc-4.4.0~1941
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6b4ef5c1fc9a858a41f069de3a89c41f1eb5f96d;p=thirdparty%2Fgcc.git

c-typeck.c (enum impl_conv): Remove ic_argpass_nonproto.

	* c-typeck.c (enum impl_conv): Remove ic_argpass_nonproto.
	(convert_for_assignment): Remove ic_argpass_nonproto cases.

From-SVN: r141347
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ef9bfbc7a1e4..e294197c7a97 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-24  Joseph Myers  <joseph@codesourcery.com>
+
+	* c-typeck.c (enum impl_conv): Remove ic_argpass_nonproto.
+	(convert_for_assignment): Remove ic_argpass_nonproto cases.
+
 2008-10-24  Jakub Jelinek  <jakub@redhat.com>
 
 	PR tree-optimization/36038
diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c
index 27564e655b42..b322db4ea519 100644
--- a/gcc/c-typeck.c
+++ b/gcc/c-typeck.c
@@ -49,7 +49,6 @@ along with GCC; see the file COPYING3.  If not see
    diagnostic messages in convert_for_assignment.  */
 enum impl_conv {
   ic_argpass,
-  ic_argpass_nonproto,
   ic_assign,
   ic_init,
   ic_return
@@ -3984,7 +3983,7 @@ convert_for_assignment (tree type, tree rhs, enum impl_conv errtype,
   tree rname = NULL_TREE;
   bool objc_ok = false;
 
-  if (errtype == ic_argpass || errtype == ic_argpass_nonproto)
+  if (errtype == ic_argpass)
     {
       tree selector;
       /* Change pointer to function to the function itself for
@@ -4017,9 +4016,6 @@ convert_for_assignment (tree type, tree rhs, enum impl_conv errtype,
                   "expected %qT but argument is of type %qT",            \
                   type, rhstype);                                        \
         break;                                                           \
-      case ic_argpass_nonproto:                                          \
-        warning (OPT, AR, parmnum, rname);                               \
-        break;                                                           \
       case ic_assign:                                                    \
         pedwarn (LOCATION, OPT, AS);                                     \
         break;                                                           \
@@ -4138,7 +4134,7 @@ convert_for_assignment (tree type, tree rhs, enum impl_conv errtype,
   /* Conversion to a transparent union from its member types.
      This applies only to function arguments.  */
   if (codel == UNION_TYPE && TYPE_TRANSPARENT_UNION (type)
-      && (errtype == ic_argpass || errtype == ic_argpass_nonproto))
+      && errtype == ic_argpass)
     {
       tree memb, marginal_memb = NULL_TREE;
 
@@ -4282,7 +4278,6 @@ convert_for_assignment (tree type, tree rhs, enum impl_conv errtype,
 	  switch (errtype)
 	  {
 	  case ic_argpass:
-	  case ic_argpass_nonproto:
 	    warning (OPT_Wmissing_format_attribute,
 		     "argument %d of %qE might be "
 		     "a candidate for a format attribute",
@@ -4448,9 +4443,6 @@ convert_for_assignment (tree type, tree rhs, enum impl_conv errtype,
   switch (errtype)
     {
     case ic_argpass:
-    case ic_argpass_nonproto:
-      /* ??? This should not be an error when inlining calls to
-	 unprototyped functions.  */
       error ("incompatible type for argument %d of %qE", parmnum, rname);
       inform ((fundecl && !DECL_IS_BUILTIN (fundecl))
 	      ? DECL_SOURCE_LOCATION (fundecl) : input_location,