diff options
Diffstat (limited to 'gcc/c/c-parser.cc')
| -rw-r--r-- | gcc/c/c-parser.cc | 50 |
1 files changed, 48 insertions, 2 deletions
diff --git a/gcc/c/c-parser.cc b/gcc/c/c-parser.cc index 911e7ed..93233a87 100644 --- a/gcc/c/c-parser.cc +++ b/gcc/c/c-parser.cc @@ -1820,6 +1820,7 @@ static void c_parser_objc_at_dynamic_declaration (c_parser *); static bool c_parser_objc_diagnose_bad_element_prefix (c_parser *, struct c_declspecs *); static location_t c_parser_parse_rtl_body (c_parser *, char *); +static tree c_parser_handle_musttail (c_parser *, tree, attr_state &); #if ENABLE_ANALYZER @@ -2519,6 +2520,32 @@ c_parser_declaration_or_fndef (c_parser *parser, bool fndef_ok, c_finish_oacc_routine (oacc_routine_data, NULL_TREE, false); return result; } + else if (specs->typespec_kind == ctsk_none + && nested + /* Only parse __attribute__((musttail)) when called from + c_parser_compound_statement_nostart. This certainly isn't + a declaration in that case, but we don't do tentative parsing + of GNU attributes right now. */ + && fallthru_attr_p + && c_parser_next_token_is_keyword (parser, RID_RETURN)) + { + attr_state astate = {}; + specs->attrs = c_parser_handle_musttail (parser, specs->attrs, astate); + if (astate.musttail_p) + { + if (specs->attrs) + { + auto_urlify_attributes sentinel; + warning_at (c_parser_peek_token (parser)->location, + OPT_Wattributes, + "attribute %<musttail%> mixed with other attributes " + "on %<return%> statement"); + } + c_parser_statement_after_labels (parser, NULL, NULL_TREE, NULL, + astate); + return result; + } + } /* Provide better error recovery. Note that a type name here is usually better diagnosed as a redeclaration. */ @@ -7373,8 +7400,12 @@ c_parser_handle_musttail (c_parser *parser, tree std_attrs, attr_state &attr) { if (c_parser_next_token_is_keyword (parser, RID_RETURN)) { - if (lookup_attribute ("gnu", "musttail", std_attrs)) + if (tree a = lookup_attribute ("gnu", "musttail", std_attrs)) { + for (; a; a = lookup_attribute ("gnu", "musttail", TREE_CHAIN (a))) + if (TREE_VALUE (a)) + error ("%qs attribute does not take any arguments", + "musttail"); std_attrs = remove_attribute ("gnu", "musttail", std_attrs); attr.musttail_p = true; } @@ -8237,7 +8268,8 @@ c_parser_statement_after_labels (c_parser *parser, bool *if_p, case RID_ATTRIBUTE: { /* Allow '__attribute__((fallthrough));' or - '__attribute__((assume(cond)));'. */ + '__attribute__((assume(cond)));' or + '__attribute__((musttail))) return'. */ tree attrs = c_parser_gnu_attributes (parser); bool has_assume = lookup_attribute ("assume", attrs); if (has_assume) @@ -8252,6 +8284,20 @@ c_parser_statement_after_labels (c_parser *parser, bool *if_p, has_assume = false; } } + gcc_assert (!astate.musttail_p); + attrs = c_parser_handle_musttail (parser, attrs, astate); + if (astate.musttail_p) + { + if (attrs) + { + auto_urlify_attributes sentinel; + warning_at (c_parser_peek_token (parser)->location, + OPT_Wattributes, + "attribute %<musttail%> mixed with other " + "attributes on %<return%> statement"); + } + goto restart; + } if (attribute_fallthrough_p (attrs)) { if (c_parser_next_token_is (parser, CPP_SEMICOLON)) |