Skip to content

R
riscv-gcc-1
Commit ee7d912e by Richard Kenner
Options

(fndef, nested_function): Pass prefix_attributes to start_function. 

(setspecs): Save prefix_attributes in declspec_stack.
(decl rules): Restore prefix_attributes along with current_declspecs.
(setattrs): Concatenate prefix_attributes to previous value.

From-SVN: r9151
parent d8d27748
Showing with 20 additions and 9 deletions
gcc/c-parse.in
...@@ -238,7 +238,7 @@ static int if_stmt_line; ...@@ -238,7 +238,7 @@ static int if_stmt_line;
static tree current_declspecs; static tree current_declspecs;
static tree prefix_attributes = NULL_TREE; static tree prefix_attributes = NULL_TREE;
/* Stack of saved values of current_declspecs. */ /* Stack of saved values of current_declspecs and prefix_attributes. */
static tree declspec_stack; static tree declspec_stack;
/* 1 if we explained undeclared var errors. */ /* 1 if we explained undeclared var errors. */
...@@ -328,7 +328,7 @@ datadef: ...@@ -328,7 +328,7 @@ datadef:
fndef: fndef:
typed_declspecs setspecs declarator typed_declspecs setspecs declarator
{ if (! start_function ($1, $3, 0)) { if (! start_function ($1, $3, prefix_attributes, 0))
YYERROR1; YYERROR1;
reinit_parse_for_function (); } reinit_parse_for_function (); }
xdecls xdecls
...@@ -338,7 +338,7 @@ fndef: ...@@ -338,7 +338,7 @@ fndef:
| typed_declspecs setspecs declarator error | typed_declspecs setspecs declarator error
{ } { }
| declmods setspecs notype_declarator | declmods setspecs notype_declarator
{ if (! start_function ($1, $3, 0)) { if (! start_function ($1, $3, prefix_attributes, 0))
YYERROR1; YYERROR1;
reinit_parse_for_function (); } reinit_parse_for_function (); }
xdecls xdecls
...@@ -348,7 +348,7 @@ fndef: ...@@ -348,7 +348,7 @@ fndef:
| declmods setspecs notype_declarator error | declmods setspecs notype_declarator error
{ } { }
| setspecs notype_declarator | setspecs notype_declarator
{ if (! start_function (NULL_TREE, $2, 0)) { if (! start_function (NULL_TREE, $2, prefix_attributes, 0))
YYERROR1; YYERROR1;
reinit_parse_for_function (); } reinit_parse_for_function (); }
xdecls xdecls
...@@ -851,10 +851,12 @@ datadecls: ...@@ -851,10 +851,12 @@ datadecls:
datadecl: datadecl:
typed_declspecs setspecs initdecls ';' typed_declspecs setspecs initdecls ';'
{ current_declspecs = TREE_VALUE (declspec_stack); { current_declspecs = TREE_VALUE (declspec_stack);
prefix_attributes = TREE_PURPOSE (declspec_stack);
declspec_stack = TREE_CHAIN (declspec_stack); declspec_stack = TREE_CHAIN (declspec_stack);
resume_momentary ($2); } resume_momentary ($2); }
| declmods setspecs notype_initdecls ';' | declmods setspecs notype_initdecls ';'
{ current_declspecs = TREE_VALUE (declspec_stack); { current_declspecs = TREE_VALUE (declspec_stack);
prefix_attributes = TREE_PURPOSE (declspec_stack);
declspec_stack = TREE_CHAIN (declspec_stack); declspec_stack = TREE_CHAIN (declspec_stack);
resume_momentary ($2); } resume_momentary ($2); }
| typed_declspecs ';' | typed_declspecs ';'
...@@ -887,31 +889,36 @@ decls: ...@@ -887,31 +889,36 @@ decls:
setspecs: /* empty */ setspecs: /* empty */
{ $$ = suspend_momentary (); { $$ = suspend_momentary ();
pending_xref_error (); pending_xref_error ();
declspec_stack = tree_cons (NULL_TREE, current_declspecs, declspec_stack = tree_cons (prefix_attributes,
current_declspecs,
declspec_stack); declspec_stack);
current_declspecs = $<ttype>0; current_declspecs = $<ttype>0;
prefix_attributes = NULL_TREE; } prefix_attributes = NULL_TREE; }
; ;
setattrs: /* empty */ setattrs: /* empty */
{ prefix_attributes = $<ttype>0; } { prefix_attributes = chainon (prefix_attributes, $<ttype>0); }
; ;
decl: decl:
typed_declspecs setspecs initdecls ';' typed_declspecs setspecs initdecls ';'
{ current_declspecs = TREE_VALUE (declspec_stack); { current_declspecs = TREE_VALUE (declspec_stack);
prefix_attributes = TREE_PURPOSE (declspec_stack);
declspec_stack = TREE_CHAIN (declspec_stack); declspec_stack = TREE_CHAIN (declspec_stack);
resume_momentary ($2); } resume_momentary ($2); }
| declmods setspecs notype_initdecls ';' | declmods setspecs notype_initdecls ';'
{ current_declspecs = TREE_VALUE (declspec_stack); { current_declspecs = TREE_VALUE (declspec_stack);
prefix_attributes = TREE_PURPOSE (declspec_stack);
declspec_stack = TREE_CHAIN (declspec_stack); declspec_stack = TREE_CHAIN (declspec_stack);
resume_momentary ($2); } resume_momentary ($2); }
| typed_declspecs setspecs nested_function | typed_declspecs setspecs nested_function
{ current_declspecs = TREE_VALUE (declspec_stack); { current_declspecs = TREE_VALUE (declspec_stack);
prefix_attributes = TREE_PURPOSE (declspec_stack);
declspec_stack = TREE_CHAIN (declspec_stack); declspec_stack = TREE_CHAIN (declspec_stack);
resume_momentary ($2); } resume_momentary ($2); }
| declmods setspecs notype_nested_function | declmods setspecs notype_nested_function
{ current_declspecs = TREE_VALUE (declspec_stack); { current_declspecs = TREE_VALUE (declspec_stack);
prefix_attributes = TREE_PURPOSE (declspec_stack);
declspec_stack = TREE_CHAIN (declspec_stack); declspec_stack = TREE_CHAIN (declspec_stack);
resume_momentary ($2); } resume_momentary ($2); }
| typed_declspecs ';' | typed_declspecs ';'
...@@ -1183,7 +1190,8 @@ end ifc ...@@ -1183,7 +1190,8 @@ end ifc
nested_function: nested_function:
declarator declarator
{ push_c_function_context (); { push_c_function_context ();
if (! start_function (current_declspecs, $1, 1)) if (! start_function (current_declspecs, $1,
prefix_attributes, 1))
{ {
pop_c_function_context (); pop_c_function_context ();
YYERROR1; YYERROR1;
...@@ -1204,7 +1212,8 @@ nested_function: ...@@ -1204,7 +1212,8 @@ nested_function:
notype_nested_function: notype_nested_function:
notype_declarator notype_declarator
{ push_c_function_context (); { push_c_function_context ();
if (! start_function (current_declspecs, $1, 1)) if (! start_function (current_declspecs, $1,
prefix_attributes, 1))
{ {
pop_c_function_context (); pop_c_function_context ();
YYERROR1; YYERROR1;
...@@ -1394,6 +1403,7 @@ component_decl: ...@@ -1394,6 +1403,7 @@ component_decl:
typed_typespecs setspecs components typed_typespecs setspecs components
{ $$ = $3; { $$ = $3;
current_declspecs = TREE_VALUE (declspec_stack); current_declspecs = TREE_VALUE (declspec_stack);
prefix_attributes = TREE_PURPOSE (declspec_stack);
declspec_stack = TREE_CHAIN (declspec_stack); declspec_stack = TREE_CHAIN (declspec_stack);
resume_momentary ($2); } resume_momentary ($2); }
| typed_typespecs | typed_typespecs
...@@ -1404,6 +1414,7 @@ component_decl: ...@@ -1404,6 +1414,7 @@ component_decl:
| nonempty_type_quals setspecs components | nonempty_type_quals setspecs components
{ $$ = $3; { $$ = $3;
current_declspecs = TREE_VALUE (declspec_stack); current_declspecs = TREE_VALUE (declspec_stack);
prefix_attributes = TREE_PURPOSE (declspec_stack);
declspec_stack = TREE_CHAIN (declspec_stack); declspec_stack = TREE_CHAIN (declspec_stack);
resume_momentary ($2); } resume_momentary ($2); }
| nonempty_type_quals | nonempty_type_quals
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment