| Message ID | 20201226175129.9621-15-luc.vanoostenryck@gmail.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | support __packed struct | expand |
diff --git a/parse.c b/parse.c index 5f33ac178a45..0fd2bb473a47 100644 --- a/parse.c +++ b/parse.c @@ -761,6 +761,8 @@ static struct token *struct_union_enum_specifier(enum type type, token = parse(token->next, sym); ctx->ctype.base_type = sym; token = expect(token, '}', "at end of specifier"); + attr.ctype.base_type = sym; + token = handle_attributes(token, &attr); apply_ctype(token->pos, &sym->ctype, &attr.ctype); // Mark the structure as needing re-examination diff --git a/validation/packed-bitfield3.c b/validation/packed-bitfield3.c index 6acff875299f..a8f740700967 100644 --- a/validation/packed-bitfield3.c +++ b/validation/packed-bitfield3.c @@ -25,5 +25,4 @@ _Static_assert( sizeof(struct c) == sizeof(u64)); /* * check-name: packed-bitfield3 - * check-known-to-fail */ diff --git a/validation/packed-bitfield4.c b/validation/packed-bitfield4.c index 0342b2414b6e..1a956344f2d3 100644 --- a/validation/packed-bitfield4.c +++ b/validation/packed-bitfield4.c @@ -15,5 +15,4 @@ static int ld(struct s *s) /* * check-name: packed-bitfield4 * check-description: Is check_access() OK with short packed bitfields? - * check-known-to-fail */ diff --git a/validation/type-attribute-align.c b/validation/type-attribute-align.c index d9358bff8327..5f3db14aceb1 100644 --- a/validation/type-attribute-align.c +++ b/validation/type-attribute-align.c @@ -16,5 +16,4 @@ void main(void) /* * check-name: type-attribute-align - * check-known-to-fail */ diff --git a/validation/type-attribute-as.c b/validation/type-attribute-as.c index b40b4e7dddf5..38f06b374e25 100644 --- a/validation/type-attribute-as.c +++ b/validation/type-attribute-as.c @@ -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) diff --git a/validation/type-attribute-mod.c b/validation/type-attribute-mod.c index 0e7b166a4aec..d55011dfa09a 100644 --- a/validation/type-attribute-mod.c +++ b/validation/type-attribute-mod.c @@ -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 | 2 ++ validation/packed-bitfield3.c | 1 - validation/packed-bitfield4.c | 1 - validation/type-attribute-align.c | 1 - validation/type-attribute-as.c | 1 - validation/type-attribute-mod.c | 1 - 6 files changed, 2 insertions(+), 5 deletions(-)