* c-common.h (objc_build_method_signature): Update prototype.

	* stub-objc.c (objc_build_method_signature): Update the stub
	implementation to accept and ignore additional parameter.
	* c-parser.c (c_parser_objc_method_decl): Reorgnize to pass
	the value of ellipsis to objc_build_method_signature instead
	of setting TREE_OVERFLOW on the parms TREE_LIST node.

	* objc-act.h (METHOD_ADD_ARGS_ELLIPSIS_P): New macro for accessing
	this field of an objc method decl.
	* objc-act.c (build_method_decl): Take an additional "ellipsis"
	argument, and set METHOD_ADD_ARGS_ELLIPSIS_P as appropriate.
	(objc_build_method_signature): Accept additional "ellipsis"
	argument and pass it to build_method_decl.
	(get_arg_type_list, start_method_def, gen_method_decl): Use
	the new METHOD_ADD_ARGS_ELLIPSIS_P instead of examining the
	TREE_OVERFLOW field of a TREE_LIST node.


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

7 files changed, 38 insertions, 13 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b182ad3e093..c7701aca354 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2005-04-21  Roger Sayle  <roger@eyesopen.com>
+
+	* c-common.h (objc_build_method_signature): Update prototype.
+	* stub-objc.c (objc_build_method_signature): Update the stub
+	implementation to accept and ignore additional parameter.
+	* c-parser.c (c_parser_objc_method_decl): Reorgnize to pass
+	the value of ellipsis to objc_build_method_signature instead
+	of setting TREE_OVERFLOW on the parms TREE_LIST node.
+
 2005-04-21  Geoffrey Keating  <geoffk@apple.com>
 
 	* config/rs6000/rs6000-protos.h (rs6000_emit_sync): New.
diff --git a/gcc/c-common.h b/gcc/c-common.h
index 80de15d3ef8..5c8fc18022a 100644
--- a/gcc/c-common.h
+++ b/gcc/c-common.h
@@ -912,7 +912,7 @@ extern void objc_continue_implementation (void);
 extern void objc_finish_implementation (void);
 extern void objc_set_visibility (int);
 extern void objc_set_method_type (enum tree_code);
-extern tree objc_build_method_signature (tree, tree, tree);
+extern tree objc_build_method_signature (tree, tree, tree, bool);
 extern void objc_add_method_declaration (tree);
 extern void objc_start_method_definition (tree);
 extern void objc_finish_method_definition (tree);
diff --git a/gcc/c-parser.c b/gcc/c-parser.c
index 6f966618bdf..0a336c624d4 100644
--- a/gcc/c-parser.c
+++ b/gcc/c-parser.c
@@ -5790,6 +5790,8 @@ c_parser_objc_method_decl (c_parser *parser)
   tree type = NULL_TREE;
   tree sel;
   tree parms = NULL_TREE;
+  bool ellipsis = false;
+
   if (c_parser_next_token_is (parser, CPP_OPEN_PAREN))
     {
       c_parser_consume_token (parser);
@@ -5804,7 +5806,6 @@ c_parser_objc_method_decl (c_parser *parser)
     {
       tree tsel = sel;
       tree list = NULL_TREE;
-      bool ellipsis;
       while (true)
 	{
 	  tree atype = NULL_TREE, id, keyworddecl;
@@ -5834,7 +5835,6 @@ c_parser_objc_method_decl (c_parser *parser)
 	 method parameters follow the C syntax, and may include '...'
 	 to denote a variable number of arguments.  */
       parms = make_node (TREE_LIST);
-      ellipsis = false;
       while (c_parser_next_token_is (parser, CPP_COMMA))
 	{
 	  struct c_parm *parm;
@@ -5851,10 +5851,9 @@ c_parser_objc_method_decl (c_parser *parser)
 	  parms = chainon (parms,
 			   build_tree_list (NULL_TREE, grokparm (parm)));
 	}
-      TREE_OVERFLOW (parms) = ellipsis;
       sel = list;
     }
-  return objc_build_method_signature (type, sel, parms);
+  return objc_build_method_signature (type, sel, parms, ellipsis);
 }
 
 /* Parse an objc-type-name.
diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog
index 01c8a2bb190..b6583b4e7cb 100644
--- a/gcc/objc/ChangeLog
+++ b/gcc/objc/ChangeLog
@@ -1,3 +1,15 @@
+2005-04-21  Roger Sayle  <roger@eyesopen.com>
+
+	* objc-act.h (METHOD_ADD_ARGS_ELLIPSIS_P): New macro for accessing
+	this field of an objc method decl.
+	* objc-act.c (build_method_decl): Take an additional "ellipsis"
+	argument, and set METHOD_ADD_ARGS_ELLIPSIS_P as appropriate.
+	(objc_build_method_signature): Accept additional "ellipsis"
+	argument and pass it to build_method_decl.
+	(get_arg_type_list, start_method_def, gen_method_decl): Use
+	the new METHOD_ADD_ARGS_ELLIPSIS_P instead of examining the
+	TREE_OVERFLOW field of a TREE_LIST node.
+
 2005-04-20  Joseph S. Myers  <joseph@codesourcery.com>
 
 	PR c/12913
diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c
index 62d5c84f9d8..017c2cd7300 100644
--- a/gcc/objc/objc-act.c
+++ b/gcc/objc/objc-act.c
@@ -164,7 +164,7 @@ static void objc_start_function (tree, tree, tree, tree);
 static void objc_start_function (tree, tree, tree, struct c_arg_info *);
 #endif
 static tree start_protocol (enum tree_code, tree, tree);
-static tree build_method_decl (enum tree_code, tree, tree, tree);
+static tree build_method_decl (enum tree_code, tree, tree, tree, bool);
 static tree objc_add_method (tree, tree, int);
 static tree add_instance_variable (tree, int, tree);
 static tree build_ivar_reference (tree);
@@ -771,9 +771,11 @@ objc_set_method_type (enum tree_code type)
 }
 
 tree
-objc_build_method_signature (tree rettype, tree selector, tree optparms)
+objc_build_method_signature (tree rettype, tree selector,
+			     tree optparms, bool ellipsis)
 {
-  return build_method_decl (objc_inherit_code, rettype, selector, optparms);
+  return build_method_decl (objc_inherit_code, rettype, selector,
+			    optparms, ellipsis);
 }
 
 void
@@ -5263,7 +5265,7 @@ build_keyword_selector (tree selector)
 
 static tree
 build_method_decl (enum tree_code code, tree ret_type, tree selector,
-		   tree add_args)
+		   tree add_args, bool ellipsis)
 {
   tree method_decl;
 
@@ -5280,6 +5282,7 @@ build_method_decl (enum tree_code code, tree ret_type, tree selector,
       METHOD_SEL_NAME (method_decl) = build_keyword_selector (selector);
       METHOD_SEL_ARGS (method_decl) = selector;
       METHOD_ADD_ARGS (method_decl) = add_args;
+      METHOD_ADD_ARGS_ELLIPSIS_P (method_decl) = ellipsis;
     }
   else
     {
@@ -5347,7 +5350,7 @@ get_arg_type_list (tree meth, int context, int superflag)
 	  chainon (arglist, build_tree_list (NULL_TREE, arg_type));
 	}
 
-      if (!TREE_OVERFLOW (METHOD_ADD_ARGS (meth)))
+      if (!METHOD_ADD_ARGS_ELLIPSIS_P (meth))
 	goto lack_of_ellipsis;
     }
   else
@@ -7536,7 +7539,7 @@ start_method_def (tree method)
 	  objc_push_parm (TREE_VALUE (akey));
 	}
 
-      if (TREE_OVERFLOW (METHOD_ADD_ARGS (method)))
+      if (METHOD_ADD_ARGS_ELLIPSIS_P (method))
 	have_ellipsis = 1;
     }
 
@@ -8116,7 +8119,7 @@ gen_method_decl (tree method)
 	      chain = TREE_CHAIN (chain);
 	    }
 
-	  if (TREE_OVERFLOW (METHOD_ADD_ARGS (method)))
+	  if (METHOD_ADD_ARGS_ELLIPSIS_P (method))
 	    strcat (errbuf, ", ...");
 	}
     }
diff --git a/gcc/objc/objc-act.h b/gcc/objc/objc-act.h
index 4050303662c..fe84260e4b5 100644
--- a/gcc/objc/objc-act.h
+++ b/gcc/objc/objc-act.h
@@ -52,6 +52,7 @@ enum gimplify_status objc_gimplify_expr (tree *, tree *, tree *);
 #define METHOD_SEL_NAME(DECL) ((DECL)->decl.name)
 #define METHOD_SEL_ARGS(DECL) ((DECL)->decl.arguments)
 #define METHOD_ADD_ARGS(DECL) ((DECL)->decl.result)
+#define METHOD_ADD_ARGS_ELLIPSIS_P(DECL) ((DECL)->decl.lang_flag_0)
 #define METHOD_DEFINITION(DECL) ((DECL)->decl.initial)
 #define METHOD_ENCODING(DECL) ((DECL)->decl.context)
 
diff --git a/gcc/stub-objc.c b/gcc/stub-objc.c
index 8c03da27545..481183fd942 100644
--- a/gcc/stub-objc.c
+++ b/gcc/stub-objc.c
@@ -189,7 +189,8 @@ objc_build_keyword_decl (tree ARG_UNUSED (selector),
 tree
 objc_build_method_signature (tree ARG_UNUSED (rettype),
 			     tree ARG_UNUSED (selectors),
-			     tree ARG_UNUSED (optparms))
+			     tree ARG_UNUSED (optparms),
+			     bool ARG_UNUSED (ellipsis))
 {
   return 0;
 }