Revert most of last change.

From-SVN: r9946

gcc/c-parse.in

@@ -27,10 +27,10 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
    written by AT&T, but I have never seen it.  */
 
 ifobjc
-%expect 53
+%expect 48
 end ifobjc
 ifc
-%expect 39
+%expect 34
 
 /* These are the 23 conflicts you should get in parse.output;
    the state numbers may vary if minor changes in the grammar are made.
@@ -338,8 +338,9 @@ datadef:
 	;
 
 fndef:
-	  typed_declspecs setspecs declarator maybe_attribute
-		{ if (! start_function ($1, $3, prefix_attributes, $4, 0))
+	  typed_declspecs setspecs declarator
+		{ if (! start_function ($1, $3, prefix_attributes,
+					NULL_TREE, 0))
 		    YYERROR1;
 		  reinit_parse_for_function (); }
 	  xdecls
@@ -355,8 +356,9 @@ fndef:
 		  prefix_attributes = TREE_PURPOSE (declspec_stack);
 		  declspec_stack = TREE_CHAIN (declspec_stack);
 		  resume_momentary ($2); }
-	| declmods setspecs notype_declarator maybe_attribute
-		{ if (! start_function ($1, $3, prefix_attributes, $4, 0))
+	| declmods setspecs notype_declarator
+		{ if (! start_function ($1, $3, prefix_attributes,
+					NULL_TREE, 0))
 		    YYERROR1;
 		  reinit_parse_for_function (); }
 	  xdecls
@@ -372,9 +374,9 @@ fndef:
 		  prefix_attributes = TREE_PURPOSE (declspec_stack);
 		  declspec_stack = TREE_CHAIN (declspec_stack);
 		  resume_momentary ($2); }
-	| setspecs notype_declarator maybe_attribute
+	| setspecs notype_declarator
 		{ if (! start_function (NULL_TREE, $2,
-					prefix_attributes, $3, 0))
+					prefix_attributes, NULL_TREE, 0))
 		    YYERROR1;
 		  reinit_parse_for_function (); }
 	  xdecls
@@ -1218,10 +1220,10 @@ end ifc
 	;
 
 nested_function:
-	  declarator maybe_attribute
+	  declarator
 		{ push_c_function_context ();
 		  if (! start_function (current_declspecs, $1,
-					prefix_attributes, $2, 1))
+					prefix_attributes, NULL_TREE, 1))
 		    {
 		      pop_c_function_context ();
 		      YYERROR1;
@@ -1241,10 +1243,10 @@ nested_function:
 	;
 
 notype_nested_function:
-	  notype_declarator maybe_attribute
+	  notype_declarator
 		{ push_c_function_context ();
 		  if (! start_function (current_declspecs, $1,
-					prefix_attributes, $2, 1))
+					prefix_attributes, NULL_TREE, 1))
 		    {
 		      pop_c_function_context ();
 		      YYERROR1;