@@ -695,6 +695,8 @@ static struct token *struct_union_enum_specifier(enum type type,
repos = &token->pos;
token = token->next;
if (match_op(token, '{')) {
+ struct decl_state attr = { .ctype.base_type = sym, };
+
// The following test is actually wrong for empty
// structs, but (1) they are not C99, (2) gcc does
// the same thing, and (3) it's easier.
@@ -704,6 +706,9 @@ static struct token *struct_union_enum_specifier(enum type type,
token = parse(token->next, sym);
token = expect(token, '}', "at end of struct-union-enum-specifier");
+ token = handle_attributes(token, &attr, KW_ATTRIBUTE);
+ apply_ctype(token->pos, &attr.ctype, &sym->ctype);
+
// Mark the structure as needing re-examination
sym->examined = 0;
sym->endpos = token->pos;
@@ -16,5 +16,4 @@ void main(void)
/*
* check-name: type-attribute-align
- * check-known-to-fail
*/
@@ -21,7 +21,6 @@ void main(void)
/*
* check-name: type-attribute-as
- * check-known-to-fail
*
* check-error-start
type-attribute-as.c:16:15: warning: incorrect type in argument 1 (different address spaces)
@@ -14,7 +14,6 @@ void main(void)
/*
* check-name: type-attribute-mod
- * check-known-to-fail
*
* check-error-start
type-attribute-mod.c:12:9: warning: dereference of noderef expression
GCC's syntax for type attributes is specified as: An attribute specifier list may appear as part of a struct, union or enum specifier. It may go either immediately after the struct, union or enum keyword, or after the closing brace. The former syntax is preferred. Where attribute specifiers follow the closing brace, they are considered to relate to the structure, union or enumerated type defined, not to any enclosing declaration the type specifier appears in, and the type defined is not complete until after the attribute specifiers. In the section about type attributes, it's also said: You may specify type attributes in an enum, struct or union type declaration or definition by placing them immediately after the struct, union or enum keyword. A less preferred syntax is to place them just past the closing curly brace of the definition. So, while placing the attribute after the closing curly is not preferred, it is cleary legal (and it seems to be much more popular than placing them just after the struct, union or enum keyword). However, currently sparse doesn't handle this correctly: - these attributes are parsed in declaration_specifiers() and added to the current decl_state - when the ';' ending the type declaration is reached, the plain struct/union/enum is used and the content of the decl_state is simply ignored. - if the declaration is for a variable, then those attributes are assigned to the variable (but not to the type). Fix this by calling handle_attribute() once we have reached the closing '}' of a struct/union/enum definition and applying these attributes, if any, directly to the current base type. Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@gmail.com> --- parse.c | 5 +++++ validation/type-attribute-align.c | 1 - validation/type-attribute-as.c | 1 - validation/type-attribute-mod.c | 1 - 4 files changed, 5 insertions(+), 3 deletions(-)