X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=parser.c;h=1f3173ff16e3c1a56e53d258e926b09e3ee299ff;hb=9fda39d0a68ce87734582057f3f31a5162e7a934;hp=171b7233d96c2f47865092735d8cb12fb4670261;hpb=a9d7d38e185e84065ca55ef2231cf90fc2202d9b;p=cparser diff --git a/parser.c b/parser.c index 171b723..1f3173f 100644 --- a/parser.c +++ b/parser.c @@ -34,6 +34,7 @@ #include "type_hash.h" #include "ast_t.h" #include "entity_t.h" +#include "attribute_t.h" #include "lang_features.h" #include "walk_statements.h" #include "warning.h" @@ -50,27 +51,6 @@ typedef struct { entity_namespace_t namespc; } stack_entry_t; -typedef struct argument_list_t argument_list_t; -struct argument_list_t { - long argument; - argument_list_t *next; -}; - -typedef struct gnu_attribute_t gnu_attribute_t; -struct gnu_attribute_t { - gnu_attribute_kind_t kind; /**< The kind of the GNU attribute. */ - gnu_attribute_t *next; - bool invalid; /**< Set if this attribute had argument errors, */ - bool has_arguments; /**< True, if this attribute has arguments. */ - union { - size_t value; - string_t string; - symbol_t *symbol; - long argument; /**< Single argument. */ - argument_list_t *arguments; /**< List of argument expressions. */ - } u; -}; - typedef struct declaration_specifiers_t declaration_specifiers_t; struct declaration_specifiers_t { source_position_t source_position; @@ -78,12 +58,7 @@ struct declaration_specifiers_t { unsigned char alignment; /**< Alignment, 0 if not set. */ bool is_inline : 1; bool thread_local : 1; /**< GCC __thread */ - bool deprecated : 1; - decl_modifiers_t modifiers; /**< declaration modifiers */ - gnu_attribute_t *gnu_attributes; /**< list of GNU attributes */ - const char *deprecated_string; /**< can be set if declaration was marked deprecated. */ - symbol_t *get_property_sym; /**< the name of the get property if set. */ - symbol_t *put_property_sym; /**< the name of the put property if set. */ + attribute_t *attributes; /**< list of attributes */ type_t *type; }; @@ -141,27 +116,6 @@ static declaration_t **incomplete_arrays; /** special symbol used for anonymous entities. */ static const symbol_t *sym_anonymous = NULL; -/* symbols for Microsoft extended-decl-modifier */ -static const symbol_t *sym_align = NULL; -static const symbol_t *sym_allocate = NULL; -static const symbol_t *sym_dllimport = NULL; -static const symbol_t *sym_dllexport = NULL; -static const symbol_t *sym_naked = NULL; -static const symbol_t *sym_noinline = NULL; -static const symbol_t *sym_returns_twice = NULL; -static const symbol_t *sym_noreturn = NULL; -static const symbol_t *sym_nothrow = NULL; -static const symbol_t *sym_novtable = NULL; -static const symbol_t *sym_property = NULL; -static const symbol_t *sym_get = NULL; -static const symbol_t *sym_put = NULL; -static const symbol_t *sym_selectany = NULL; -static const symbol_t *sym_thread = NULL; -static const symbol_t *sym_uuid = NULL; -static const symbol_t *sym_deprecated = NULL; -static const symbol_t *sym_restrict = NULL; -static const symbol_t *sym_noalias = NULL; - /** The token anchor set */ static unsigned char token_anchor_set[T_LAST_TOKEN]; @@ -171,8 +125,6 @@ static unsigned char token_anchor_set[T_LAST_TOKEN]; /** true if we are in GCC mode. */ #define GNU_MODE ((c_mode & _GNUC) || in_gcc_extension) -static type_t *type_valist; - static statement_t *parse_compound_statement(bool inside_expression_statement); static statement_t *parse_statement(void); @@ -184,6 +136,9 @@ static void parse_external(void); static void parse_compound_type_entries(compound_t *compound_declaration); +static void check_call_argument(type_t *expected_type, + call_argument_t *argument, unsigned pos); + typedef enum declarator_flags_t { DECL_FLAGS_NONE = 0, DECL_MAY_BE_ABSTRACT = 1U << 0, @@ -244,6 +199,11 @@ static void create_microsoft_intrinsics(void); case T_unsigned: \ case T_void: \ case T_wchar_t: \ + case T__int8: \ + case T__int16: \ + case T__int32: \ + case T__int64: \ + case T__int128: \ COMPLEX_SPECIFIERS \ IMAGINARY_SPECIFIERS @@ -294,6 +254,7 @@ static void create_microsoft_intrinsics(void); case T___builtin_offsetof: \ case T___builtin_va_arg: \ case T___builtin_va_start: \ + case T___builtin_va_copy: \ case T___func__: \ case T___noop: \ case T__assume: \ @@ -343,6 +304,8 @@ static size_t get_entity_struct_size(entity_kind_t kind) /** * Allocate an entity of given kind and initialize all * fields with zero. + * + * @param kind the kind of the entity to allocate */ static entity_t *allocate_entity_zero(entity_kind_t kind) { @@ -417,6 +380,7 @@ static size_t get_expression_struct_size(expression_kind_t kind) [EXPR_OFFSETOF] = sizeof(offsetof_expression_t), [EXPR_VA_START] = sizeof(va_start_expression_t), [EXPR_VA_ARG] = sizeof(va_arg_expression_t), + [EXPR_VA_COPY] = sizeof(va_copy_expression_t), [EXPR_STATEMENT] = sizeof(statement_expression_t), [EXPR_LABEL_ADDRESS] = sizeof(label_address_expression_t), }; @@ -450,6 +414,8 @@ static statement_t *allocate_statement_zero(statement_kind_t kind) /** * Allocate an expression node of given kind and initialize all * fields with zero. + * + * @param kind the kind of the expression to allocate */ static expression_t *allocate_expression_zero(expression_kind_t kind) { @@ -827,6 +793,21 @@ static entity_t *get_entity(const symbol_t *const symbol, return NULL; } +/* §6.2.3:1 24) There is only one name space for tags even though three are + * possible. */ +static entity_t *get_tag(symbol_t const *const symbol, + entity_kind_tag_t const kind) +{ + entity_t *entity = get_entity(symbol, NAMESPACE_TAG); + if (entity != NULL && entity->kind != kind) { + errorf(HERE, + "'%Y' defined as wrong kind of tag (previous definition %P)", + symbol, &entity->base.source_position); + entity = NULL; + } + return entity; +} + /** * pushs an entity on the environment stack and links the corresponding symbol * it. @@ -968,7 +949,7 @@ static int get_rank(const type_t *type) } /** - * Do integer promotion for a given type. + * §6.3.1.1:2 Do integer promotion for a given type. * * @param type the type to promote * @return the promoted type @@ -1020,7 +1001,7 @@ static bool is_null_pointer_constant(const expression_t *expression) return is_type_integer(type) && is_constant_expression(expression) && - fold_constant(expression) == 0; + !fold_constant_to_bool(expression); } /** @@ -1208,75 +1189,6 @@ static string_t parse_string_literals(void) return result; } -static const char *const gnu_attribute_names[GNU_AK_LAST] = { - [GNU_AK_CONST] = "const", - [GNU_AK_VOLATILE] = "volatile", - [GNU_AK_CDECL] = "cdecl", - [GNU_AK_STDCALL] = "stdcall", - [GNU_AK_FASTCALL] = "fastcall", - [GNU_AK_DEPRECATED] = "deprecated", - [GNU_AK_NOINLINE] = "noinline", - [GNU_AK_RETURNS_TWICE] = "returns_twice", - [GNU_AK_NORETURN] = "noreturn", - [GNU_AK_NAKED] = "naked", - [GNU_AK_PURE] = "pure", - [GNU_AK_ALWAYS_INLINE] = "always_inline", - [GNU_AK_MALLOC] = "malloc", - [GNU_AK_WEAK] = "weak", - [GNU_AK_CONSTRUCTOR] = "constructor", - [GNU_AK_DESTRUCTOR] = "destructor", - [GNU_AK_NOTHROW] = "nothrow", - [GNU_AK_TRANSPARENT_UNION] = "transparent_union", - [GNU_AK_COMMON] = "common", - [GNU_AK_NOCOMMON] = "nocommon", - [GNU_AK_PACKED] = "packed", - [GNU_AK_SHARED] = "shared", - [GNU_AK_NOTSHARED] = "notshared", - [GNU_AK_USED] = "used", - [GNU_AK_UNUSED] = "unused", - [GNU_AK_NO_INSTRUMENT_FUNCTION] = "no_instrument_function", - [GNU_AK_WARN_UNUSED_RESULT] = "warn_unused_result", - [GNU_AK_LONGCALL] = "longcall", - [GNU_AK_SHORTCALL] = "shortcall", - [GNU_AK_LONG_CALL] = "long_call", - [GNU_AK_SHORT_CALL] = "short_call", - [GNU_AK_FUNCTION_VECTOR] = "function_vector", - [GNU_AK_INTERRUPT] = "interrupt", - [GNU_AK_INTERRUPT_HANDLER] = "interrupt_handler", - [GNU_AK_NMI_HANDLER] = "nmi_handler", - [GNU_AK_NESTING] = "nesting", - [GNU_AK_NEAR] = "near", - [GNU_AK_FAR] = "far", - [GNU_AK_SIGNAL] = "signal", - [GNU_AK_EIGTHBIT_DATA] = "eightbit_data", - [GNU_AK_TINY_DATA] = "tiny_data", - [GNU_AK_SAVEALL] = "saveall", - [GNU_AK_FLATTEN] = "flatten", - [GNU_AK_SSEREGPARM] = "sseregparm", - [GNU_AK_EXTERNALLY_VISIBLE] = "externally_visible", - [GNU_AK_RETURN_TWICE] = "return_twice", - [GNU_AK_MAY_ALIAS] = "may_alias", - [GNU_AK_MS_STRUCT] = "ms_struct", - [GNU_AK_GCC_STRUCT] = "gcc_struct", - [GNU_AK_DLLIMPORT] = "dllimport", - [GNU_AK_DLLEXPORT] = "dllexport", - [GNU_AK_ALIGNED] = "aligned", - [GNU_AK_ALIAS] = "alias", - [GNU_AK_SECTION] = "section", - [GNU_AK_FORMAT] = "format", - [GNU_AK_FORMAT_ARG] = "format_arg", - [GNU_AK_WEAKREF] = "weakref", - [GNU_AK_NONNULL] = "nonnull", - [GNU_AK_TLS_MODEL] = "tls_model", - [GNU_AK_VISIBILITY] = "visibility", - [GNU_AK_REGPARM] = "regparm", - [GNU_AK_MODE] = "mode", - [GNU_AK_MODEL] = "model", - [GNU_AK_TRAP_EXIT] = "trap_exit", - [GNU_AK_SP_SWITCH] = "sp_switch", - [GNU_AK_SENTINEL] = "sentinel" -}; - /** * compare two string, ignoring double underscores on the second. */ @@ -1293,619 +1205,282 @@ static int strcmp_underscore(const char *s1, const char *s2) return strcmp(s1, s2); } -/** - * Allocate a new gnu temporal attribute of given kind. - */ -static gnu_attribute_t *allocate_gnu_attribute(gnu_attribute_kind_t kind) +static attribute_t *allocate_attribute_zero(attribute_kind_t kind) { - gnu_attribute_t *attribute = obstack_alloc(&temp_obst, sizeof(*attribute)); - attribute->kind = kind; - attribute->next = NULL; - attribute->invalid = false; - attribute->has_arguments = false; - + attribute_t *attribute = allocate_ast_zero(sizeof(*attribute)); + attribute->kind = kind; return attribute; } /** - * Parse one constant expression argument of the given attribute. + * Parse (gcc) attribute argument. From gcc comments in gcc source: + * + * attribute: + * __attribute__ ( ( attribute-list ) ) + * + * attribute-list: + * attrib + * attribute_list , attrib + * + * attrib: + * empty + * any-word + * any-word ( identifier ) + * any-word ( identifier , nonempty-expr-list ) + * any-word ( expr-list ) + * + * where the "identifier" must not be declared as a type, and + * "any-word" may be any identifier (including one declared as a + * type), a reserved word storage class specifier, type specifier or + * type qualifier. ??? This still leaves out most reserved keywords + * (following the old parser), shouldn't we include them, and why not + * allow identifiers declared as types to start the arguments? + * + * Matze: this all looks confusing and little systematic, so we're even less + * strict and parse any list of things which are identifiers or + * (assignment-)expressions. */ -static void parse_gnu_attribute_const_arg(gnu_attribute_t *attribute) +static attribute_argument_t *parse_attribute_arguments(void) { - expression_t *expression; - add_anchor_token(')'); - expression = parse_constant_expression(); - rem_anchor_token(')'); - expect(')', end_error); - attribute->u.argument = fold_constant(expression); - return; -end_error: - attribute->invalid = true; -} + if (token.type == ')') + return NULL; -/** - * Parse a list of constant expressions arguments of the given attribute. - */ -static void parse_gnu_attribute_const_arg_list(gnu_attribute_t *attribute) -{ - argument_list_t **list = &attribute->u.arguments; - argument_list_t *entry; - expression_t *expression; - add_anchor_token(')'); - add_anchor_token(','); + attribute_argument_t *first = NULL; + attribute_argument_t *last = NULL; while (true) { - expression = parse_constant_expression(); - entry = obstack_alloc(&temp_obst, sizeof(entry)); - entry->argument = fold_constant(expression); - entry->next = NULL; - *list = entry; - list = &entry->next; - if (token.type != ',') - break; - next_token(); - } - rem_anchor_token(','); - rem_anchor_token(')'); - expect(')', end_error); - return; -end_error: - attribute->invalid = true; -} - -/** - * Parse one string literal argument of the given attribute. - */ -static void parse_gnu_attribute_string_arg(gnu_attribute_t *attribute, - string_t *string) -{ - add_anchor_token('('); - if (token.type != T_STRING_LITERAL) { - parse_error_expected("while parsing attribute directive", - T_STRING_LITERAL, NULL); - goto end_error; - } - *string = parse_string_literals(); - rem_anchor_token('('); - expect(')', end_error); - return; -end_error: - attribute->invalid = true; -} + attribute_argument_t *argument = allocate_ast_zero(sizeof(*argument)); + + /* is it an identifier */ + if (token.type == T_IDENTIFIER + && (look_ahead(1)->type == ',' || look_ahead(1)->type == ')')) { + symbol_t *symbol = token.v.symbol; + argument->kind = ATTRIBUTE_ARGUMENT_SYMBOL; + argument->v.symbol = symbol; + next_token(); + } else { + /* must be an expression */ + expression_t *expression = parse_assignment_expression(); -/** - * Parse one tls model of the given attribute. - */ -static void parse_gnu_attribute_tls_model_arg(gnu_attribute_t *attribute) -{ - static const char *const tls_models[] = { - "global-dynamic", - "local-dynamic", - "initial-exec", - "local-exec" - }; - string_t string = { NULL, 0 }; - parse_gnu_attribute_string_arg(attribute, &string); - if (string.begin != NULL) { - for (size_t i = 0; i < 4; ++i) { - if (strcmp(tls_models[i], string.begin) == 0) { - attribute->u.value = i; - return; - } + argument->kind = ATTRIBUTE_ARGUMENT_EXPRESSION; + argument->v.expression = expression; } - errorf(HERE, "'%s' is an unrecognized tls model", string.begin); - } - attribute->invalid = true; -} -/** - * Parse one tls model of the given attribute. - */ -static void parse_gnu_attribute_visibility_arg(gnu_attribute_t *attribute) -{ - static const char *const visibilities[] = { - "default", - "protected", - "hidden", - "internal" - }; - string_t string = { NULL, 0 }; - parse_gnu_attribute_string_arg(attribute, &string); - if (string.begin != NULL) { - for (size_t i = 0; i < 4; ++i) { - if (strcmp(visibilities[i], string.begin) == 0) { - attribute->u.value = i; - return; - } + /* append argument */ + if (last == NULL) { + first = argument; + } else { + last->next = argument; } - errorf(HERE, "'%s' is an unrecognized visibility", string.begin); - } - attribute->invalid = true; -} + last = argument; -/** - * Parse one (code) model of the given attribute. - */ -static void parse_gnu_attribute_model_arg(gnu_attribute_t *attribute) -{ - static const char *const visibilities[] = { - "small", - "medium", - "large" - }; - string_t string = { NULL, 0 }; - parse_gnu_attribute_string_arg(attribute, &string); - if (string.begin != NULL) { - for (int i = 0; i < 3; ++i) { - if (strcmp(visibilities[i], string.begin) == 0) { - attribute->u.value = i; - return; - } + if (token.type == ',') { + next_token(); + continue; } - errorf(HERE, "'%s' is an unrecognized model", string.begin); + expect(')', end_error); + break; } - attribute->invalid = true; + + return first; + +end_error: + /* TODO... */ + return first; } -/** - * Parse one mode of the given attribute. - */ -static void parse_gnu_attribute_mode_arg(gnu_attribute_t *attribute) +static attribute_t *parse_attribute_asm(void) { - add_anchor_token(')'); + eat(T_asm); - if (token.type != T_IDENTIFIER) { - expect(T_IDENTIFIER, end_error); - } + attribute_t *attribute = allocate_attribute_zero(ATTRIBUTE_GNU_ASM); - attribute->u.symbol = token.v.symbol; - next_token(); + expect('(', end_error); + attribute->a.arguments = parse_attribute_arguments(); + return attribute; - rem_anchor_token(')'); - expect(')', end_error); - return; end_error: - attribute->invalid = true; + return NULL; } -/** - * Parse one interrupt argument of the given attribute. - */ -static void parse_gnu_attribute_interrupt_arg(gnu_attribute_t *attribute) +static symbol_t *get_symbol_from_token(void) { - static const char *const interrupts[] = { - "IRQ", - "FIQ", - "SWI", - "ABORT", - "UNDEF" - }; - string_t string = { NULL, 0 }; - parse_gnu_attribute_string_arg(attribute, &string); - if (string.begin != NULL) { - for (size_t i = 0; i < 5; ++i) { - if (strcmp(interrupts[i], string.begin) == 0) { - attribute->u.value = i; - return; - } - } - errorf(HERE, "'%s' is not an interrupt", string.begin); + switch(token.type) { + case T_IDENTIFIER: + return token.v.symbol; + case T_auto: + case T_char: + case T_double: + case T_enum: + case T_extern: + case T_float: + case T_int: + case T_long: + case T_register: + case T_short: + case T_static: + case T_struct: + case T_union: + case T_unsigned: + case T_void: + case T_bool: + case T__Bool: + case T_class: + case T_explicit: + case T_export: + case T_wchar_t: + case T_const: + case T_signed: + case T___real__: + case T___imag__: + case T_restrict: + case T_volatile: + case T_inline: + /* maybe we need more tokens ... add them on demand */ + return get_token_symbol(&token); + default: + return NULL; } - attribute->invalid = true; } -/** - * Parse ( identifier, const expression, const expression ) - */ -static void parse_gnu_attribute_format_args(gnu_attribute_t *attribute) +static attribute_t *parse_attribute_gnu_single(void) { - static const char *const format_names[] = { - "printf", - "scanf", - "strftime", - "strfmon" - }; - int i; - - if (token.type != T_IDENTIFIER) { - parse_error_expected("while parsing format attribute directive", T_IDENTIFIER, NULL); + /* parse "any-word" */ + symbol_t *symbol = get_symbol_from_token(); + if (symbol == NULL) { + parse_error_expected("while parsing attribute((", T_IDENTIFIER, NULL); goto end_error; } - const char *name = token.v.symbol->string; - for (i = 0; i < 4; ++i) { - if (strcmp_underscore(format_names[i], name) == 0) + + const char *name = symbol->string; + next_token(); + + attribute_kind_t kind; + for (kind = ATTRIBUTE_GNU_FIRST; kind <= ATTRIBUTE_GNU_LAST; ++kind) { + const char *attribute_name = get_attribute_name(kind); + if (attribute_name != NULL + && strcmp_underscore(attribute_name, name) == 0) break; } - if (i >= 4) { - if (warning.attribute) - warningf(HERE, "'%s' is an unrecognized format function type", name); + + if (kind >= ATTRIBUTE_GNU_LAST) { + if (warning.attribute) { + warningf(HERE, "unknown attribute '%s' ignored", name); + } + /* TODO: we should still save the attribute in the list... */ + kind = ATTRIBUTE_UNKNOWN; } - next_token(); - expect(',', end_error); - add_anchor_token(')'); - add_anchor_token(','); - parse_constant_expression(); - rem_anchor_token(','); - rem_anchor_token(')'); + attribute_t *attribute = allocate_attribute_zero(kind); - expect(',', end_error); - add_anchor_token(')'); - parse_constant_expression(); - rem_anchor_token(')'); - expect(')', end_error); - return; -end_error: - attribute->u.value = true; -} + /* parse arguments */ + if (token.type == '(') { + next_token(); + attribute->a.arguments = parse_attribute_arguments(); + } -/** - * Check that a given GNU attribute has no arguments. - */ -static void check_no_argument(gnu_attribute_t *attribute, const char *name) -{ - if (!attribute->has_arguments) - return; + return attribute; - /* should have no arguments */ - errorf(HERE, "wrong number of arguments specified for '%s' attribute", name); - eat_until_matching_token('('); - /* we have already consumed '(', so we stop before ')', eat it */ - eat(')'); - attribute->invalid = true; +end_error: + return NULL; } -/** - * Parse one GNU attribute. - * - * Note that attribute names can be specified WITH or WITHOUT - * double underscores, ie const or __const__. - * - * The following attributes are parsed without arguments - * const - * volatile - * cdecl - * stdcall - * fastcall - * deprecated - * noinline - * noreturn - * naked - * pure - * always_inline - * malloc - * weak - * constructor - * destructor - * nothrow - * transparent_union - * common - * nocommon - * packed - * shared - * notshared - * used - * unused - * no_instrument_function - * warn_unused_result - * longcall - * shortcall - * long_call - * short_call - * function_vector - * interrupt_handler - * nmi_handler - * nesting - * near - * far - * signal - * eightbit_data - * tiny_data - * saveall - * flatten - * sseregparm - * externally_visible - * return_twice - * may_alias - * ms_struct - * gcc_struct - * dllimport - * dllexport - * - * The following attributes are parsed with arguments - * aligned( const expression ) - * alias( string literal ) - * section( string literal ) - * format( identifier, const expression, const expression ) - * format_arg( const expression ) - * tls_model( string literal ) - * visibility( string literal ) - * regparm( const expression ) - * model( string leteral ) - * trap_exit( const expression ) - * sp_switch( string literal ) - * - * The following attributes might have arguments - * weak_ref( string literal ) - * non_null( const expression // ',' ) - * interrupt( string literal ) - * sentinel( constant expression ) - */ -static decl_modifiers_t parse_gnu_attribute(gnu_attribute_t **attributes) +static attribute_t *parse_attribute_gnu(void) { - gnu_attribute_t *head = *attributes; - gnu_attribute_t *last = *attributes; - decl_modifiers_t modifiers = 0; - gnu_attribute_t *attribute; + attribute_t *first = NULL; + attribute_t *last = NULL; eat(T___attribute__); expect('(', end_error); expect('(', end_error); - if (token.type != ')') { - /* find the end of the list */ - if (last != NULL) { - while (last->next != NULL) - last = last->next; - } - - /* non-empty attribute list */ - while (true) { - const char *name; - if (token.type == T_const) { - name = "const"; - } else if (token.type == T_volatile) { - name = "volatile"; - } else if (token.type == T_cdecl) { - /* __attribute__((cdecl)), WITH ms mode */ - name = "cdecl"; - } else if (token.type == T_IDENTIFIER) { - const symbol_t *sym = token.v.symbol; - name = sym->string; - } else { - parse_error_expected("while parsing GNU attribute", T_IDENTIFIER, NULL); - break; - } - - next_token(); - - int i; - for (i = 0; i < GNU_AK_LAST; ++i) { - if (strcmp_underscore(gnu_attribute_names[i], name) == 0) - break; - } - gnu_attribute_kind_t kind = (gnu_attribute_kind_t)i; - - attribute = NULL; - if (kind == GNU_AK_LAST) { - if (warning.attribute) - warningf(HERE, "'%s' attribute directive ignored", name); - - /* skip possible arguments */ - if (token.type == '(') { - eat_until_matching_token(')'); - } - } else { - /* check for arguments */ - attribute = allocate_gnu_attribute(kind); - if (token.type == '(') { - next_token(); - if (token.type == ')') { - /* empty args are allowed */ - next_token(); - } else - attribute->has_arguments = true; - } - - switch (kind) { - case GNU_AK_VOLATILE: - case GNU_AK_NAKED: - case GNU_AK_MALLOC: - case GNU_AK_WEAK: - case GNU_AK_COMMON: - case GNU_AK_NOCOMMON: - case GNU_AK_SHARED: - case GNU_AK_NOTSHARED: - case GNU_AK_NO_INSTRUMENT_FUNCTION: - case GNU_AK_WARN_UNUSED_RESULT: - case GNU_AK_LONGCALL: - case GNU_AK_SHORTCALL: - case GNU_AK_LONG_CALL: - case GNU_AK_SHORT_CALL: - case GNU_AK_FUNCTION_VECTOR: - case GNU_AK_INTERRUPT_HANDLER: - case GNU_AK_NMI_HANDLER: - case GNU_AK_NESTING: - case GNU_AK_NEAR: - case GNU_AK_FAR: - case GNU_AK_SIGNAL: - case GNU_AK_EIGTHBIT_DATA: - case GNU_AK_TINY_DATA: - case GNU_AK_SAVEALL: - case GNU_AK_FLATTEN: - case GNU_AK_SSEREGPARM: - case GNU_AK_EXTERNALLY_VISIBLE: - case GNU_AK_RETURN_TWICE: - case GNU_AK_MAY_ALIAS: - case GNU_AK_MS_STRUCT: - case GNU_AK_GCC_STRUCT: - goto no_arg; - - case GNU_AK_CDECL: modifiers |= DM_CDECL; goto no_arg; - case GNU_AK_FASTCALL: modifiers |= DM_FASTCALL; goto no_arg; - case GNU_AK_STDCALL: modifiers |= DM_STDCALL; goto no_arg; - case GNU_AK_UNUSED: modifiers |= DM_UNUSED; goto no_arg; - case GNU_AK_USED: modifiers |= DM_USED; goto no_arg; - case GNU_AK_PURE: modifiers |= DM_PURE; goto no_arg; - case GNU_AK_CONST: modifiers |= DM_CONST; goto no_arg; - case GNU_AK_ALWAYS_INLINE: modifiers |= DM_FORCEINLINE; goto no_arg; - case GNU_AK_DLLIMPORT: modifiers |= DM_DLLIMPORT; goto no_arg; - case GNU_AK_DLLEXPORT: modifiers |= DM_DLLEXPORT; goto no_arg; - case GNU_AK_PACKED: modifiers |= DM_PACKED; goto no_arg; - case GNU_AK_NOINLINE: modifiers |= DM_NOINLINE; goto no_arg; - case GNU_AK_RETURNS_TWICE: modifiers |= DM_RETURNS_TWICE; goto no_arg; - case GNU_AK_NORETURN: modifiers |= DM_NORETURN; goto no_arg; - case GNU_AK_NOTHROW: modifiers |= DM_NOTHROW; goto no_arg; - case GNU_AK_TRANSPARENT_UNION: modifiers |= DM_TRANSPARENT_UNION; goto no_arg; - case GNU_AK_CONSTRUCTOR: modifiers |= DM_CONSTRUCTOR; goto no_arg; - case GNU_AK_DESTRUCTOR: modifiers |= DM_DESTRUCTOR; goto no_arg; - case GNU_AK_DEPRECATED: modifiers |= DM_DEPRECATED; goto no_arg; - - case GNU_AK_ALIGNED: - /* __align__ may be used without an argument */ - if (attribute->has_arguments) { - parse_gnu_attribute_const_arg(attribute); - } - break; + if (token.type == ')') { + next_token(); + expect(')', end_error); + return first; + } - case GNU_AK_FORMAT_ARG: - case GNU_AK_REGPARM: - case GNU_AK_TRAP_EXIT: - if (!attribute->has_arguments) { - /* should have arguments */ - errorf(HERE, "wrong number of arguments specified for '%s' attribute", name); - attribute->invalid = true; - } else - parse_gnu_attribute_const_arg(attribute); - break; - case GNU_AK_ALIAS: - case GNU_AK_SECTION: - case GNU_AK_SP_SWITCH: - if (!attribute->has_arguments) { - /* should have arguments */ - errorf(HERE, "wrong number of arguments specified for '%s' attribute", name); - attribute->invalid = true; - } else - parse_gnu_attribute_string_arg(attribute, &attribute->u.string); - break; - case GNU_AK_FORMAT: - if (!attribute->has_arguments) { - /* should have arguments */ - errorf(HERE, "wrong number of arguments specified for '%s' attribute", name); - attribute->invalid = true; - } else - parse_gnu_attribute_format_args(attribute); - break; - case GNU_AK_WEAKREF: - /* may have one string argument */ - if (attribute->has_arguments) - parse_gnu_attribute_string_arg(attribute, &attribute->u.string); - break; - case GNU_AK_NONNULL: - if (attribute->has_arguments) - parse_gnu_attribute_const_arg_list(attribute); - break; - case GNU_AK_TLS_MODEL: - if (!attribute->has_arguments) { - /* should have arguments */ - errorf(HERE, "wrong number of arguments specified for '%s' attribute", name); - } else - parse_gnu_attribute_tls_model_arg(attribute); - break; - case GNU_AK_VISIBILITY: - if (!attribute->has_arguments) { - /* should have arguments */ - errorf(HERE, "wrong number of arguments specified for '%s' attribute", name); - } else - parse_gnu_attribute_visibility_arg(attribute); - break; - case GNU_AK_MODEL: - if (!attribute->has_arguments) { - /* should have arguments */ - errorf(HERE, "wrong number of arguments specified for '%s' attribute", name); - } else { - parse_gnu_attribute_model_arg(attribute); - } - break; - case GNU_AK_MODE: - if (!attribute->has_arguments) { - /* should have arguments */ - errorf(HERE, "wrong number of arguments specified for '%s' attribute", name); - } else { - parse_gnu_attribute_mode_arg(attribute); - } - break; - case GNU_AK_INTERRUPT: - /* may have one string argument */ - if (attribute->has_arguments) - parse_gnu_attribute_interrupt_arg(attribute); - break; - case GNU_AK_SENTINEL: - /* may have one string argument */ - if (attribute->has_arguments) - parse_gnu_attribute_const_arg(attribute); - break; - case GNU_AK_LAST: - /* already handled */ - break; + while (true) { + attribute_t *attribute = parse_attribute_gnu_single(); + if (attribute == NULL) + goto end_error; -no_arg: - check_no_argument(attribute, name); - } - } - if (attribute != NULL) { - if (last != NULL) { - last->next = attribute; - last = attribute; - } else { - head = last = attribute; - } - } + if (last == NULL) { + first = attribute; + } else { + last->next = attribute; + } + last = attribute; - if (token.type != ',') - break; + if (token.type == ')') { next_token(); + break; } + expect(',', end_error); } expect(')', end_error); - expect(')', end_error); -end_error: - *attributes = head; - return modifiers; +end_error: + return first; } -/** - * Parse GNU attributes. - */ -static decl_modifiers_t parse_attributes(gnu_attribute_t **attributes) +/** Parse attributes. */ +static attribute_t *parse_attributes(attribute_t *first) { - decl_modifiers_t modifiers = 0; - + attribute_t *last = first; while (true) { + if (last != NULL) { + while (last->next != NULL) + last = last->next; + } + + attribute_t *attribute; switch (token.type) { case T___attribute__: - modifiers |= parse_gnu_attribute(attributes); - continue; + attribute = parse_attribute_gnu(); + break; case T_asm: + attribute = parse_attribute_asm(); + break; + + case T_cdecl: next_token(); - expect('(', end_error); - if (token.type != T_STRING_LITERAL) { - parse_error_expected("while parsing assembler attribute", - T_STRING_LITERAL, NULL); - eat_until_matching_token('('); - break; - } else { - parse_string_literals(); - } - expect(')', end_error); - continue; + attribute = allocate_attribute_zero(ATTRIBUTE_MS_CDECL); + break; - case T_cdecl: modifiers |= DM_CDECL; break; - case T__fastcall: modifiers |= DM_FASTCALL; break; - case T__stdcall: modifiers |= DM_STDCALL; break; + case T__fastcall: + next_token(); + attribute = allocate_attribute_zero(ATTRIBUTE_MS_FASTCALL); + break; + + case T__forceinline: + next_token(); + attribute = allocate_attribute_zero(ATTRIBUTE_MS_FORCEINLINE); + break; + + case T__stdcall: + next_token(); + attribute = allocate_attribute_zero(ATTRIBUTE_MS_STDCALL); + break; case T___thiscall: + next_token(); /* TODO record modifier */ if (warning.other) warningf(HERE, "Ignoring declaration modifier %K", &token); + attribute = allocate_attribute_zero(ATTRIBUTE_MS_THISCALL); break; -end_error: - default: return modifiers; + default: + return first; } - next_token(); + if (last == NULL) { + first = attribute; + } else { + last->next = attribute; + } + last = attribute; } } @@ -2032,6 +1607,10 @@ static void mark_vars_read(expression_t *const expr, entity_t *lhs_ent) mark_vars_read(expr->va_arge.ap, lhs_ent); return; + case EXPR_VA_COPY: + mark_vars_read(expr->va_copye.src, lhs_ent); + return; + case EXPR_UNARY_CAST: /* Special case: Use void cast to mark a variable as "read" */ if (is_type_atomic(skip_typeref(expr->base.type), ATOMIC_TYPE_VOID)) @@ -2534,7 +2113,7 @@ static bool walk_designator(type_path_t *path, const designator_t *designator, goto failed; } - long index = fold_constant(array_index); + long index = fold_constant_to_int(array_index); if (!used_in_offsetof) { if (index < 0) { errorf(&designator->source_position, @@ -2614,18 +2193,6 @@ static void advance_current_object(type_path_t *path, size_t top_path_level) } } -/** - * skip until token is found. - */ -static void skip_until(int type) -{ - while (token.type != type) { - if (token.type == T_EOF) - return; - next_token(); - } -} - /** * skip any {...} blocks until a closing bracket is reached. */ @@ -2959,30 +2526,28 @@ static void append_entity(scope_t *scope, entity_t *entity) static compound_t *parse_compound_type_specifier(bool is_struct) { - gnu_attribute_t *attributes = NULL; - decl_modifiers_t modifiers = 0; if (is_struct) { eat(T_struct); } else { eat(T_union); } - symbol_t *symbol = NULL; - compound_t *compound = NULL; + symbol_t *symbol = NULL; + compound_t *compound = NULL; + attribute_t *attributes = NULL; if (token.type == T___attribute__) { - modifiers |= parse_attributes(&attributes); + attributes = parse_attributes(NULL); } + entity_kind_tag_t const kind = is_struct ? ENTITY_STRUCT : ENTITY_UNION; if (token.type == T_IDENTIFIER) { + /* the compound has a name, check if we have seen it already */ symbol = token.v.symbol; next_token(); - namespace_tag_t const namespc = - is_struct ? NAMESPACE_STRUCT : NAMESPACE_UNION; - entity_t *entity = get_entity(symbol, namespc); + entity_t *entity = get_tag(symbol, kind); if (entity != NULL) { - assert(entity->kind == (is_struct ? ENTITY_STRUCT : ENTITY_UNION)); compound = &entity->compound; if (compound->base.parent_scope != current_scope && (token.type == '{' || token.type == ';')) { @@ -3011,12 +2576,10 @@ static compound_t *parse_compound_type_specifier(bool is_struct) } if (compound == NULL) { - entity_kind_t kind = is_struct ? ENTITY_STRUCT : ENTITY_UNION; - entity_t *entity = allocate_entity_zero(kind); - compound = &entity->compound; + entity_t *entity = allocate_entity_zero(kind); + compound = &entity->compound; - compound->base.namespc = - (is_struct ? NAMESPACE_STRUCT : NAMESPACE_UNION); + compound->base.namespc = NAMESPACE_TAG; compound->base.source_position = token.source_position; compound->base.symbol = symbol; compound->base.parent_scope = current_scope; @@ -3028,15 +2591,18 @@ static compound_t *parse_compound_type_specifier(bool is_struct) if (token.type == '{') { parse_compound_type_entries(compound); - modifiers |= parse_attributes(&attributes); + /* ISO/IEC 14882:1998(E) §7.1.3:5 */ if (symbol == NULL) { assert(anonymous_entity == NULL); anonymous_entity = (entity_t*)compound; } } - compound->modifiers |= modifiers; + if (attributes != NULL) { + handle_entity_attributes(attributes, (entity_t*) compound); + } + return compound; } @@ -3091,7 +2657,6 @@ end_error: static type_t *parse_enum_specifier(void) { - gnu_attribute_t *attributes = NULL; entity_t *entity; symbol_t *symbol; @@ -3100,9 +2665,8 @@ static type_t *parse_enum_specifier(void) symbol = token.v.symbol; next_token(); - entity = get_entity(symbol, NAMESPACE_ENUM); + entity = get_tag(symbol, ENTITY_ENUM); if (entity != NULL) { - assert(entity->kind == ENTITY_ENUM); if (entity->base.parent_scope != current_scope && (token.type == '{' || token.type == ';')) { /* we're in an inner scope and have a definition. Shadow @@ -3124,7 +2688,7 @@ static type_t *parse_enum_specifier(void) if (entity == NULL) { entity = allocate_entity_zero(ENTITY_ENUM); - entity->base.namespc = NAMESPACE_ENUM; + entity->base.namespc = NAMESPACE_TAG; entity->base.source_position = token.source_position; entity->base.symbol = symbol; entity->base.parent_scope = current_scope; @@ -3142,8 +2706,9 @@ static type_t *parse_enum_specifier(void) entity->enume.complete = true; parse_enum_entries(type); - parse_attributes(&attributes); + parse_attributes(NULL); + /* ISO/IEC 14882:1998(E) §7.1.3:5 */ if (symbol == NULL) { assert(anonymous_entity == NULL); anonymous_entity = entity; @@ -3262,392 +2827,165 @@ static type_t *get_typedef_type(symbol_t *symbol) return type; } -/** - * check for the allowed MS alignment values. - */ -static bool check_alignment_value(long long intvalue) +static attribute_t *parse_attribute_ms_property(attribute_t *attribute) { - if (intvalue < 1 || intvalue > 8192) { - errorf(HERE, "illegal alignment value"); - return false; - } - unsigned v = (unsigned)intvalue; - for (unsigned i = 1; i <= 8192; i += i) { - if (i == v) - return true; - } - errorf(HERE, "alignment must be power of two"); - return false; -} - -#define DET_MOD(name, tag) do { \ - if (*modifiers & tag && warning.other) warningf(HERE, #name " used more than once"); \ - *modifiers |= tag; \ -} while (0) + expect('(', end_error); -static void parse_microsoft_extended_decl_modifier(declaration_specifiers_t *specifiers) -{ - decl_modifiers_t *modifiers = &specifiers->modifiers; + attribute_property_argument_t *property + = allocate_ast_zero(sizeof(*property)); while (true) { - if (token.type == T_restrict) { - next_token(); - DET_MOD(restrict, DM_RESTRICT); - goto end_loop; - } else if (token.type != T_IDENTIFIER) - break; + if (token.type != T_IDENTIFIER) { + parse_error_expected("while parsing property declspec", + T_IDENTIFIER, NULL); + goto end_error; + } + + bool is_put; symbol_t *symbol = token.v.symbol; - if (symbol == sym_align) { - next_token(); - expect('(', end_error); - if (token.type != T_INTEGER) - goto end_error; - if (check_alignment_value(token.v.intvalue)) { - if (specifiers->alignment != 0 && warning.other) - warningf(HERE, "align used more than once"); - specifiers->alignment = (unsigned char)token.v.intvalue; - } - next_token(); - expect(')', end_error); - } else if (symbol == sym_allocate) { - next_token(); - expect('(', end_error); - if (token.type != T_IDENTIFIER) - goto end_error; - (void)token.v.symbol; - expect(')', end_error); - } else if (symbol == sym_dllimport) { - next_token(); - DET_MOD(dllimport, DM_DLLIMPORT); - } else if (symbol == sym_dllexport) { - next_token(); - DET_MOD(dllexport, DM_DLLEXPORT); - } else if (symbol == sym_thread) { - next_token(); - DET_MOD(thread, DM_THREAD); - } else if (symbol == sym_naked) { - next_token(); - DET_MOD(naked, DM_NAKED); - } else if (symbol == sym_noinline) { - next_token(); - DET_MOD(noinline, DM_NOINLINE); - } else if (symbol == sym_returns_twice) { - next_token(); - DET_MOD(returns_twice, DM_RETURNS_TWICE); - } else if (symbol == sym_noreturn) { - next_token(); - DET_MOD(noreturn, DM_NORETURN); - } else if (symbol == sym_nothrow) { - next_token(); - DET_MOD(nothrow, DM_NOTHROW); - } else if (symbol == sym_novtable) { - next_token(); - DET_MOD(novtable, DM_NOVTABLE); - } else if (symbol == sym_property) { - next_token(); - expect('(', end_error); - for (;;) { - bool is_get = false; - if (token.type != T_IDENTIFIER) - goto end_error; - if (token.v.symbol == sym_get) { - is_get = true; - } else if (token.v.symbol == sym_put) { - } else { - errorf(HERE, "Bad property name '%Y'", token.v.symbol); - goto end_error; - } - next_token(); - expect('=', end_error); - if (token.type != T_IDENTIFIER) - goto end_error; - if (is_get) { - if (specifiers->get_property_sym != NULL) { - errorf(HERE, "get property name already specified"); - } else { - specifiers->get_property_sym = token.v.symbol; - } - } else { - if (specifiers->put_property_sym != NULL) { - errorf(HERE, "put property name already specified"); - } else { - specifiers->put_property_sym = token.v.symbol; - } - } - next_token(); - if (token.type == ',') { - next_token(); - continue; - } - break; - } - expect(')', end_error); - } else if (symbol == sym_selectany) { - next_token(); - DET_MOD(selectany, DM_SELECTANY); - } else if (symbol == sym_uuid) { - next_token(); - expect('(', end_error); - if (token.type != T_STRING_LITERAL) - goto end_error; - next_token(); - expect(')', end_error); - } else if (symbol == sym_deprecated) { - next_token(); - if (specifiers->deprecated != 0 && warning.other) - warningf(HERE, "deprecated used more than once"); - specifiers->deprecated = true; - if (token.type == '(') { - next_token(); - if (token.type == T_STRING_LITERAL) { - specifiers->deprecated_string = token.v.string.begin; - next_token(); - } else { - errorf(HERE, "string literal expected"); - } - expect(')', end_error); - } - } else if (symbol == sym_noalias) { - next_token(); - DET_MOD(noalias, DM_NOALIAS); + next_token(); + if (strcmp(symbol->string, "put") == 0) { + is_put = true; + } else if (strcmp(symbol->string, "get") == 0) { + is_put = false; } else { - if (warning.other) - warningf(HERE, "Unknown modifier '%Y' ignored", token.v.symbol); - next_token(); - if (token.type == '(') - skip_until(')'); + errorf(HERE, "expected put or get in property declspec"); + goto end_error; } -end_loop: - if (token.type == ',') - next_token(); - } -end_error: - return; -} - -static entity_t *create_error_entity(symbol_t *symbol, entity_kind_tag_t kind) -{ - entity_t *entity = allocate_entity_zero(kind); - entity->base.source_position = *HERE; - entity->base.symbol = symbol; - if (is_declaration(entity)) { - entity->declaration.type = type_error_type; - entity->declaration.implicit = true; - } else if (kind == ENTITY_TYPEDEF) { - entity->typedefe.type = type_error_type; - entity->typedefe.builtin = true; + expect('=', end_error); + if (token.type != T_IDENTIFIER) { + parse_error_expected("while parsing property declspec", + T_IDENTIFIER, NULL); + goto end_error; + } + if (is_put) { + property->put_symbol = token.v.symbol; + } else { + property->get_symbol = token.v.symbol; + } + next_token(); + if (token.type == ')') + break; + expect(',', end_error); } - if (kind != ENTITY_COMPOUND_MEMBER) - record_entity(entity, false); - return entity; -} -static variable_t *parse_microsoft_based(void) -{ - if (token.type != T_IDENTIFIER) { - parse_error_expected("while parsing __based", T_IDENTIFIER, NULL); - return NULL; - } - symbol_t *symbol = token.v.symbol; - entity_t *entity = get_entity(symbol, NAMESPACE_NORMAL); + attribute->a.property = property; - variable_t *variable; - if (entity == NULL || entity->base.kind != ENTITY_VARIABLE) { - errorf(HERE, "'%Y' is not a variable name.", symbol); - variable = &create_error_entity(symbol, ENTITY_VARIABLE)->variable; - } else { - variable = &entity->variable; + expect(')', end_error); - type_t *const type = variable->base.type; - if (is_type_valid(type)) { - if (! is_type_pointer(skip_typeref(type))) { - errorf(HERE, "variable in __based modifier must have pointer type instead of '%T'", type); - } - if (variable->base.base.parent_scope != file_scope) { - errorf(HERE, "a nonstatic local variable may not be used in a __based specification"); - } - } - } - next_token(); - return variable; +end_error: + return attribute; } -/** - * Finish the construction of a struct type by calculating - * its size, offsets, alignment. - */ -static void finish_struct_type(compound_type_t *type) +static attribute_t *parse_microsoft_extended_decl_modifier_single(void) { - assert(type->compound != NULL); - - compound_t *compound = type->compound; - if (!compound->complete) - return; - - il_size_t size = 0; - il_size_t offset; - il_alignment_t alignment = 1; - bool need_pad = false; - - entity_t *entry = compound->members.entities; - for (; entry != NULL; entry = entry->base.next) { - if (entry->kind != ENTITY_COMPOUND_MEMBER) - continue; + attribute_kind_t kind = ATTRIBUTE_UNKNOWN; + if (token.type == T_restrict) { + kind = ATTRIBUTE_MS_RESTRICT; + next_token(); + } else if (token.type == T_IDENTIFIER) { + const char *name = token.v.symbol->string; + next_token(); + for (attribute_kind_t k = ATTRIBUTE_MS_FIRST; k <= ATTRIBUTE_MS_LAST; + ++k) { + const char *attribute_name = get_attribute_name(k); + if (attribute_name != NULL && strcmp(attribute_name, name) == 0) { + kind = k; + break; + } + } - type_t *m_type = skip_typeref(entry->declaration.type); - if (! is_type_valid(m_type)) { - /* simply ignore errors here */ - continue; + if (kind == ATTRIBUTE_UNKNOWN && warning.attribute) { + warningf(HERE, "unknown __declspec '%s' ignored", name); } - il_alignment_t m_alignment = m_type->base.alignment; - if (m_alignment > alignment) - alignment = m_alignment; + } else { + parse_error_expected("while parsing __declspec", T_IDENTIFIER, NULL); + return NULL; + } - offset = (size + m_alignment - 1) & -m_alignment; + attribute_t *attribute = allocate_attribute_zero(kind); - if (offset > size) - need_pad = true; - entry->compound_member.offset = offset; - size = offset + m_type->base.size; + if (kind == ATTRIBUTE_MS_PROPERTY) { + return parse_attribute_ms_property(attribute); } - if (type->base.alignment != 0) { - alignment = type->base.alignment; - } - - offset = (size + alignment - 1) & -alignment; - if (offset > size) - need_pad = true; - if (need_pad) { - if (warning.padded) { - warningf(&compound->base.source_position, "'%T' needs padding", type); - } - } else { - if (compound->modifiers & DM_PACKED && warning.packed) { - warningf(&compound->base.source_position, - "superfluous packed attribute on '%T'", type); - } + /* parse arguments */ + if (token.type == '(') { + next_token(); + attribute->a.arguments = parse_attribute_arguments(); } - type->base.size = offset; - type->base.alignment = alignment; + return attribute; } -/** - * Finish the construction of an union type by calculating - * its size and alignment. - */ -static void finish_union_type(compound_type_t *type) +static attribute_t *parse_microsoft_extended_decl_modifier(attribute_t *first) { - assert(type->compound != NULL); + eat(T__declspec); - compound_t *compound = type->compound; - if (! compound->complete) - return; + expect('(', end_error); - il_size_t size = 0; - il_alignment_t alignment = 1; + if (token.type == ')') { + next_token(); + return NULL; + } - entity_t *entry = compound->members.entities; - for (; entry != NULL; entry = entry->base.next) { - if (entry->kind != ENTITY_COMPOUND_MEMBER) - continue; + add_anchor_token(')'); - type_t *m_type = skip_typeref(entry->declaration.type); - if (! is_type_valid(m_type)) - continue; + attribute_t *last = first; + while (true) { + if (last != NULL) { + while (last->next != NULL) + last = last->next; + } - entry->compound_member.offset = 0; - if (m_type->base.size > size) - size = m_type->base.size; - if (m_type->base.alignment > alignment) - alignment = m_type->base.alignment; - } - if (type->base.alignment != 0) { - alignment = type->base.alignment; - } - size = (size + alignment - 1) & -alignment; - type->base.size = size; - type->base.alignment = alignment; -} + attribute_t *attribute + = parse_microsoft_extended_decl_modifier_single(); + if (attribute == NULL) + goto end_error; -static type_t *handle_attribute_mode(const gnu_attribute_t *attribute, - type_t *orig_type) -{ - type_t *type = skip_typeref(orig_type); + if (last == NULL) { + first = attribute; + } else { + last->next = attribute; + } + last = attribute; - /* at least: byte, word, pointer, list of machine modes - * __XXX___ is interpreted as XXX */ - - /* This isn't really correct, the backend should provide a list of machine - * specific modes (according to gcc philosophy that is...) */ - const char *symbol_str = attribute->u.symbol->string; - bool sign = is_type_signed(type); - atomic_type_kind_t akind; - if (strcmp_underscore("QI", symbol_str) == 0 || - strcmp_underscore("byte", symbol_str) == 0) { - akind = sign ? ATOMIC_TYPE_CHAR : ATOMIC_TYPE_UCHAR; - } else if (strcmp_underscore("HI", symbol_str) == 0) { - akind = sign ? ATOMIC_TYPE_SHORT : ATOMIC_TYPE_USHORT; - } else if (strcmp_underscore("SI", symbol_str) == 0 - || strcmp_underscore("word", symbol_str) == 0 - || strcmp_underscore("pointer", symbol_str) == 0) { - akind = sign ? ATOMIC_TYPE_INT : ATOMIC_TYPE_UINT; - } else if (strcmp_underscore("DI", symbol_str) == 0) { - akind = sign ? ATOMIC_TYPE_LONGLONG : ATOMIC_TYPE_ULONGLONG; - } else { - if (warning.other) - warningf(HERE, "ignoring unknown mode '%s'", symbol_str); - return orig_type; + if (token.type == ')') { + break; + } + expect(',', end_error); } - if (type->kind == TYPE_ATOMIC) { - type_t *copy = duplicate_type(type); - copy->atomic.akind = akind; - return identify_new_type(copy); - } else if (type->kind == TYPE_ENUM) { - type_t *copy = duplicate_type(type); - copy->enumt.akind = akind; - return identify_new_type(copy); - } else if (is_type_pointer(type)) { - warningf(HERE, "__attribute__((mode)) on pointers not implemented yet (ignored)"); - return type; - } + rem_anchor_token(')'); + expect(')', end_error); + return first; - errorf(HERE, "__attribute__((mode)) only allowed on integer, enum or pointer type"); - return orig_type; +end_error: + rem_anchor_token(')'); + return first; } -static type_t *handle_type_attributes(const gnu_attribute_t *attributes, - type_t *type) +static entity_t *create_error_entity(symbol_t *symbol, entity_kind_tag_t kind) { - const gnu_attribute_t *attribute = attributes; - for ( ; attribute != NULL; attribute = attribute->next) { - if (attribute->invalid) - continue; - - if (attribute->kind == GNU_AK_MODE) { - type = handle_attribute_mode(attribute, type); - } else if (attribute->kind == GNU_AK_ALIGNED) { - int alignment = 32; /* TODO: fill in maximum useful alignment for - target machine */ - if (attribute->has_arguments) - alignment = attribute->u.argument; - - type_t *copy = duplicate_type(type); - copy->base.alignment = attribute->u.argument; - type = identify_new_type(copy); - } + entity_t *entity = allocate_entity_zero(kind); + entity->base.source_position = *HERE; + entity->base.symbol = symbol; + if (is_declaration(entity)) { + entity->declaration.type = type_error_type; + entity->declaration.implicit = true; + } else if (kind == ENTITY_TYPEDEF) { + entity->typedefe.type = type_error_type; + entity->typedefe.builtin = true; } - - return type; + if (kind != ENTITY_COMPOUND_MEMBER) + record_entity(entity, false); + return entity; } static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) { type_t *type = NULL; type_qualifiers_t qualifiers = TYPE_QUALIFIER_NONE; - type_modifiers_t modifiers = TYPE_MODIFIER_NONE; unsigned type_specifiers = 0; bool newtype = false; bool saw_error = false; @@ -3656,8 +2994,7 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) specifiers->source_position = token.source_position; while (true) { - specifiers->modifiers - |= parse_attributes(&specifiers->gnu_attributes); + specifiers->attributes = parse_attributes(specifiers->attributes); switch (token.type) { /* storage class */ @@ -3679,12 +3016,8 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) MATCH_STORAGE_CLASS(T_register, STORAGE_CLASS_REGISTER) case T__declspec: - next_token(); - expect('(', end_error); - add_anchor_token(')'); - parse_microsoft_extended_decl_modifier(specifiers); - rem_anchor_token(')'); - expect(')', end_error); + specifiers->attributes + = parse_microsoft_extended_decl_modifier(specifiers->attributes); break; case T___thread: @@ -3762,16 +3095,18 @@ wrong_thread_stoarge_class: MATCH_SPECIFIER(T_void, SPECIFIER_VOID, "void"); MATCH_SPECIFIER(T_wchar_t, SPECIFIER_WCHAR_T, "wchar_t"); - case T__forceinline: - /* only in microsoft mode */ - specifiers->modifiers |= DM_FORCEINLINE; - /* FALLTHROUGH */ - case T_inline: next_token(); specifiers->is_inline = true; break; +#if 0 + case T__forceinline: + next_token(); + specifiers->modifiers |= DM_FORCEINLINE; + break; +#endif + case T_long: if (type_specifiers & SPECIFIER_LONG_LONG) { errorf(HERE, "multiple type specifiers given"); @@ -3783,28 +3118,31 @@ wrong_thread_stoarge_class: next_token(); break; - case T_struct: { +#define CHECK_DOUBLE_TYPE() \ + if ( type != NULL) \ + errorf(HERE, "multiple data types in declaration specifiers"); + + case T_struct: + CHECK_DOUBLE_TYPE(); type = allocate_type_zero(TYPE_COMPOUND_STRUCT); type->compound.compound = parse_compound_type_specifier(true); - finish_struct_type(&type->compound); break; - } - case T_union: { + case T_union: + CHECK_DOUBLE_TYPE(); type = allocate_type_zero(TYPE_COMPOUND_UNION); type->compound.compound = parse_compound_type_specifier(false); - if (type->compound.compound->modifiers & DM_TRANSPARENT_UNION) - modifiers |= TYPE_MODIFIER_TRANSPARENT_UNION; - finish_union_type(&type->compound); break; - } case T_enum: + CHECK_DOUBLE_TYPE(); type = parse_enum_specifier(); break; case T___typeof__: + CHECK_DOUBLE_TYPE(); type = parse_typeof(); break; case T___builtin_va_list: + CHECK_DOUBLE_TYPE(); type = duplicate_type(type_valist); next_token(); break; @@ -3878,8 +3216,7 @@ wrong_thread_stoarge_class: } finish_specifiers: - specifiers->modifiers - |= parse_attributes(&specifiers->gnu_attributes); + specifiers->attributes = parse_attributes(specifiers->attributes); in_gcc_extension = old_gcc_extension; @@ -4058,21 +3395,13 @@ warn_about_long_long: type = allocate_type_zero(TYPE_ATOMIC); type->atomic.akind = atomic_type; } - type->base.alignment = get_atomic_type_alignment(atomic_type); - unsigned const size = get_atomic_type_size(atomic_type); - type->base.size = - type_specifiers & SPECIFIER_COMPLEX ? size * 2 : size; newtype = true; } else if (type_specifiers != 0) { errorf(HERE, "multiple datatypes in declaration"); } /* FIXME: check type qualifiers here */ - - if (specifiers->modifiers & DM_TRANSPARENT_UNION) - modifiers |= TYPE_MODIFIER_TRANSPARENT_UNION; type->base.qualifiers = qualifiers; - type->base.modifiers = modifiers; if (newtype) { type = identify_new_type(type); @@ -4080,7 +3409,8 @@ warn_about_long_long: type = typehash_insert(type); } - type = handle_type_attributes(specifiers->gnu_attributes, type); + if (specifiers->attributes != NULL) + type = handle_type_attributes(specifiers->attributes, type); specifiers->type = type; return; @@ -4169,6 +3499,8 @@ static bool has_parameters(void) /* func(void) is not a parameter */ if (token.type == T_IDENTIFIER) { entity_t const *const entity = get_entity(token.v.symbol, NAMESPACE_NORMAL); + if (entity == NULL) + return true; if (entity->kind != ENTITY_TYPEDEF) return true; if (skip_typeref(entity->typedefe.type) != type_void) @@ -4282,7 +3614,7 @@ typedef struct construct_type_base_t { typedef struct parsed_pointer_t { construct_type_base_t base; type_qualifiers_t type_qualifiers; - variable_t *base_variable; /**< MS __based extension. */ + variable_t *base_variable; /**< MS __based extension. */ } parsed_pointer_t; typedef struct parsed_reference_t { @@ -4311,18 +3643,17 @@ union construct_type_t { parsed_array_t array; }; -static construct_type_t *parse_pointer_declarator(variable_t *base_variable) +static construct_type_t *parse_pointer_declarator(void) { eat('*'); - construct_type_t *cons = obstack_alloc(&temp_obst, sizeof(cons->pointer)); - parsed_pointer_t *pointer = &cons->pointer; - memset(pointer, 0, sizeof(*pointer)); - cons->kind = CONSTRUCT_POINTER; + parsed_pointer_t *pointer = obstack_alloc(&temp_obst, sizeof(pointer[0])); + memset(pointer, 0, sizeof(pointer[0])); + pointer->base.kind = CONSTRUCT_POINTER; pointer->type_qualifiers = parse_type_qualifiers(); - pointer->base_variable = base_variable; + //pointer->base_variable = base_variable; - return cons; + return (construct_type_t*) pointer; } static construct_type_t *parse_reference_declarator(void) @@ -4366,6 +3697,16 @@ static construct_type_t *parse_array_declarator(void) next_token(); } else if (token.type != ']') { expression_t *const size = parse_assignment_expression(); + + /* §6.7.5.2:1 Array size must have integer type */ + type_t *const orig_type = size->base.type; + type_t *const type = skip_typeref(orig_type); + if (!is_type_integer(type) && is_type_valid(type)) { + errorf(&size->base.source_position, + "array size '%E' must have integer type but has type '%T'", + size, orig_type); + } + array->size = size; mark_vars_read(size, NULL); } @@ -4377,25 +3718,13 @@ end_error: return cons; } -static construct_type_t *parse_function_declarator(scope_t *scope, - decl_modifiers_t modifiers) +static construct_type_t *parse_function_declarator(scope_t *scope) { type_t *type = allocate_type_zero(TYPE_FUNCTION); function_type_t *ftype = &type->function; - ftype->linkage = current_linkage; - - switch (modifiers & (DM_CDECL | DM_STDCALL | DM_FASTCALL | DM_THISCALL)) { - case DM_NONE: break; - case DM_CDECL: ftype->calling_convention = CC_CDECL; break; - case DM_STDCALL: ftype->calling_convention = CC_STDCALL; break; - case DM_FASTCALL: ftype->calling_convention = CC_FASTCALL; break; - case DM_THISCALL: ftype->calling_convention = CC_THISCALL; break; - - default: - errorf(HERE, "multiple calling conventions in declaration"); - break; - } + ftype->linkage = current_linkage; + ftype->calling_convention = CC_CDECL; parse_parameters(ftype, scope); @@ -4409,26 +3738,27 @@ static construct_type_t *parse_function_declarator(scope_t *scope, } typedef struct parse_declarator_env_t { + bool may_be_abstract : 1; + bool must_be_abstract : 1; decl_modifiers_t modifiers; symbol_t *symbol; source_position_t source_position; scope_t parameters; + attribute_t *attributes; } parse_declarator_env_t; -static construct_type_t *parse_inner_declarator(parse_declarator_env_t *env, - bool may_be_abstract) +static construct_type_t *parse_inner_declarator(parse_declarator_env_t *env) { /* construct a single linked list of construct_type_t's which describe * how to construct the final declarator type */ construct_type_t *first = NULL; construct_type_t **anchor = &first; - gnu_attribute_t *attributes = NULL; - decl_modifiers_t modifiers = parse_attributes(&attributes); + env->attributes = parse_attributes(env->attributes); for (;;) { construct_type_t *type; - variable_t *based = NULL; /* MS __based extension */ + //variable_t *based = NULL; /* MS __based extension */ switch (token.type) { case '&': if (!(c_mode & _CXX)) @@ -4437,6 +3767,7 @@ static construct_type_t *parse_inner_declarator(parse_declarator_env_t *env, break; case T__based: { +#if 0 source_position_t const pos = *HERE; next_token(); expect('(', end_error); @@ -4453,11 +3784,14 @@ static construct_type_t *parse_inner_declarator(parse_declarator_env_t *env, } continue; } +#else + panic("based currently disabled"); +#endif /* FALLTHROUGH */ } case '*': - type = parse_pointer_declarator(based); + type = parse_pointer_declarator(); break; default: @@ -4468,20 +3802,20 @@ static construct_type_t *parse_inner_declarator(parse_declarator_env_t *env, anchor = &type->base.next; /* TODO: find out if this is correct */ - modifiers |= parse_attributes(&attributes); + env->attributes = parse_attributes(env->attributes); } -ptr_operator_end: - if (env != NULL) { - modifiers |= env->modifiers; - env->modifiers = modifiers; - } +ptr_operator_end: ; +#if 0 + modifiers |= env->modifiers; + env->modifiers = modifiers; +#endif construct_type_t *inner_types = NULL; switch (token.type) { case T_IDENTIFIER: - if (env == NULL) { + if (env->must_be_abstract) { errorf(HERE, "no identifier expected in typename"); } else { env->symbol = token.v.symbol; @@ -4496,17 +3830,17 @@ ptr_operator_end: if (look_ahead(1)->type != ')') { next_token(); add_anchor_token(')'); - inner_types = parse_inner_declarator(env, may_be_abstract); + inner_types = parse_inner_declarator(env); if (inner_types != NULL) { /* All later declarators only modify the return type */ - env = NULL; + env->must_be_abstract = true; } rem_anchor_token(')'); expect(')', end_error); } break; default: - if (may_be_abstract) + if (env->may_be_abstract) break; parse_error_expected("while parsing declarator", T_IDENTIFIER, '(', NULL); eat_until_anchor(); @@ -4520,10 +3854,11 @@ ptr_operator_end: switch (token.type) { case '(': { scope_t *scope = NULL; - if (env != NULL) + if (!env->must_be_abstract) { scope = &env->parameters; + } - type = parse_function_declarator(scope, modifiers); + type = parse_function_declarator(scope); break; } case '[': @@ -4550,69 +3885,6 @@ end_error: return NULL; } -static void parse_declaration_attributes(entity_t *entity) -{ - gnu_attribute_t *attributes = NULL; - decl_modifiers_t modifiers = parse_attributes(&attributes); - - if (entity == NULL) - return; - - type_t *type; - if (entity->kind == ENTITY_TYPEDEF) { - modifiers |= entity->typedefe.modifiers; - type = entity->typedefe.type; - } else { - assert(is_declaration(entity)); - modifiers |= entity->declaration.modifiers; - type = entity->declaration.type; - } - if (type == NULL) - return; - - gnu_attribute_t *attribute = attributes; - for ( ; attribute != NULL; attribute = attribute->next) { - if (attribute->invalid) - continue; - - if (attribute->kind == GNU_AK_MODE) { - type = handle_attribute_mode(attribute, type); - } else if (attribute->kind == GNU_AK_ALIGNED) { - int alignment = 32; /* TODO: fill in maximum usefull alignment for target machine */ - if (attribute->has_arguments) - alignment = attribute->u.argument; - - if (entity->kind == ENTITY_TYPEDEF) { - type_t *copy = duplicate_type(type); - copy->base.alignment = attribute->u.argument; - type = identify_new_type(copy); - } else if(entity->kind == ENTITY_VARIABLE) { - entity->variable.alignment = alignment; - } else if(entity->kind == ENTITY_COMPOUND_MEMBER) { - entity->compound_member.alignment = alignment; - } - } - } - - type_modifiers_t type_modifiers = type->base.modifiers; - if (modifiers & DM_TRANSPARENT_UNION) - type_modifiers |= TYPE_MODIFIER_TRANSPARENT_UNION; - - if (type->base.modifiers != type_modifiers) { - type_t *copy = duplicate_type(type); - copy->base.modifiers = type_modifiers; - type = identify_new_type(copy); - } - - if (entity->kind == ENTITY_TYPEDEF) { - entity->typedefe.type = type; - entity->typedefe.modifiers = modifiers; - } else { - entity->declaration.type = type; - entity->declaration.modifiers = modifiers; - } -} - static type_t *construct_declarator_type(construct_type_t *construct_list, type_t *type) { construct_type_t *iter = construct_list; @@ -4682,9 +3954,21 @@ static type_t *construct_declarator_type(construct_type_t *construct_list, type_ if (size_expression != NULL) { if (is_constant_expression(size_expression)) { + long const size + = fold_constant_to_int(size_expression); + array_type->array.size = size; array_type->array.size_constant = true; - array_type->array.size - = fold_constant(size_expression); + /* §6.7.5.2:1 If the expression is a constant expression, it shall + * have a value greater than zero. */ + if (size <= 0) { + if (size < 0 || !GNU_MODE) { + errorf(&size_expression->base.source_position, + "size of array must be greater than zero"); + } else if (warning.other) { + warningf(&size_expression->base.source_position, + "zero length arrays are a GCC extension"); + } + } } else { array_type->array.is_vla = true; } @@ -4747,10 +4031,9 @@ static entity_t *parse_declarator(const declaration_specifiers_t *specifiers, { parse_declarator_env_t env; memset(&env, 0, sizeof(env)); - env.modifiers = specifiers->modifiers; + env.may_be_abstract = (flags & DECL_MAY_BE_ABSTRACT) != 0; - construct_type_t *construct_type = - parse_inner_declarator(&env, (flags & DECL_MAY_BE_ABSTRACT) != 0); + construct_type_t *construct_type = parse_inner_declarator(&env); type_t *orig_type = construct_declarator_type(construct_type, specifiers->type); type_t *type = skip_typeref(orig_type); @@ -4759,6 +4042,18 @@ static entity_t *parse_declarator(const declaration_specifiers_t *specifiers, obstack_free(&temp_obst, construct_type); } + attribute_t *attributes = parse_attributes(env.attributes); + /* append (shared) specifier attribute behind attributes of this + declarator */ + if (attributes != NULL) { + attribute_t *last = attributes; + while (last->next != NULL) + last = last->next; + last->next = specifiers->attributes; + } else { + attributes = specifiers->attributes; + } + entity_t *entity; if (specifiers->storage_class == STORAGE_CLASS_TYPEDEF) { entity = allocate_entity_zero(ENTITY_TYPEDEF); @@ -4810,11 +4105,14 @@ static entity_t *parse_declarator(const declaration_specifiers_t *specifiers, entity->function.parameters = env.parameters; if (env.symbol != NULL) { + /* this needs fixes for C++ */ + bool in_function_scope = current_function != NULL; + if (specifiers->thread_local || ( - specifiers->storage_class != STORAGE_CLASS_EXTERN && - specifiers->storage_class != STORAGE_CLASS_NONE && - specifiers->storage_class != STORAGE_CLASS_STATIC - )) { + specifiers->storage_class != STORAGE_CLASS_EXTERN && + specifiers->storage_class != STORAGE_CLASS_NONE && + (in_function_scope || specifiers->storage_class != STORAGE_CLASS_STATIC) + )) { errorf(&env.source_position, "invalid storage class for function '%Y'", env.symbol); } @@ -4822,9 +4120,6 @@ static entity_t *parse_declarator(const declaration_specifiers_t *specifiers, } else { entity = allocate_entity_zero(ENTITY_VARIABLE); - entity->variable.get_property_sym = specifiers->get_property_sym; - entity->variable.put_property_sym = specifiers->put_property_sym; - entity->variable.thread_local = specifiers->thread_local; if (env.symbol != NULL) { @@ -4859,10 +4154,11 @@ static entity_t *parse_declarator(const declaration_specifiers_t *specifiers, } else { entity->base.source_position = specifiers->source_position; } - entity->base.namespc = NAMESPACE_NORMAL; - entity->declaration.type = orig_type; - entity->declaration.modifiers = env.modifiers; - entity->declaration.deprecated_string = specifiers->deprecated_string; + entity->base.namespc = NAMESPACE_NORMAL; + entity->declaration.type = orig_type; + entity->declaration.alignment = get_type_alignment(orig_type); + entity->declaration.modifiers = env.modifiers; + entity->declaration.attributes = attributes; storage_class_t storage_class = specifiers->storage_class; entity->declaration.declared_storage_class = storage_class; @@ -4872,19 +4168,27 @@ static entity_t *parse_declarator(const declaration_specifiers_t *specifiers, entity->declaration.storage_class = storage_class; } - parse_declaration_attributes(entity); + if (attributes != NULL) { + handle_entity_attributes(attributes, entity); + } return entity; } static type_t *parse_abstract_declarator(type_t *base_type) { - construct_type_t *construct_type = parse_inner_declarator(NULL, 1); + parse_declarator_env_t env; + memset(&env, 0, sizeof(env)); + env.may_be_abstract = true; + env.must_be_abstract = true; + + construct_type_t *construct_type = parse_inner_declarator(&env); type_t *result = construct_declarator_type(construct_type, base_type); if (construct_type != NULL) { obstack_free(&temp_obst, construct_type); } + result = handle_type_attributes(env.attributes, result); return result; } @@ -5066,7 +4370,6 @@ static entity_t *record_entity(entity_t *entity, const bool is_definition) prev_decl->storage_class = decl->storage_class; prev_decl->declared_storage_class = decl->declared_storage_class; prev_decl->modifiers = decl->modifiers; - prev_decl->deprecated_string = decl->deprecated_string; return previous_entity; } @@ -5437,6 +4740,7 @@ static void parse_declaration(parsed_declaration_func finished_declaration, } } +/* §6.5.2.2:6 */ static type_t *get_default_promoted_type(type_t *orig_type) { type_t *result = orig_type; @@ -5513,18 +4817,18 @@ decl_list_end: if (strict_mode) { errorf(HERE, "no type specified for function parameter '%Y'", parameter->base.symbol); + parameter_type = type_error_type; } else { if (warning.implicit_int) { warningf(HERE, "no type specified for function parameter '%Y', using 'int'", parameter->base.symbol); } - parameter_type = type_int; - parameter->declaration.type = parameter_type; + parameter_type = type_int; } + parameter->declaration.type = parameter_type; } semantic_parameter_incomplete(parameter); - parameter_type = parameter->declaration.type; /* * we need the default promoted types for the function type @@ -5673,7 +4977,7 @@ static int determine_truth(expression_t const* const cond) { return !is_constant_expression(cond) ? 0 : - fold_constant(cond) != 0 ? 1 : + fold_constant_to_bool(cond) ? 1 : -1; } @@ -5757,6 +5061,9 @@ static bool expression_returns(expression_t const *const expr) case EXPR_VA_ARG: return expression_returns(expr->va_arge.ap); + case EXPR_VA_COPY: + return expression_returns(expr->va_copye.src); + EXPR_UNARY_CASES_MANDATORY return expression_returns(expr->unary.value); @@ -5883,7 +5190,7 @@ static void check_reachable(statement_t *const stmt) return; if (is_constant_expression(expr)) { - long const val = fold_constant(expr); + long const val = fold_constant_to_int(expr); case_label_statement_t * defaults = NULL; for (case_label_statement_t *i = switchs->first_case; i != NULL; i = i->next) { if (i->expression == NULL) { @@ -6466,18 +5773,22 @@ static type_t *make_bitfield_type(type_t *base_type, expression_t *size, base_type); bit_size = 0; } else { - bit_size = skipped_type->base.size * 8; + bit_size = get_type_size(base_type) * 8; } if (is_constant_expression(size)) { - long v = fold_constant(size); + long v = fold_constant_to_int(size); + const symbol_t *user_symbol = symbol == NULL ? sym_anonymous : symbol; if (v < 0) { - errorf(source_position, "negative width in bit-field '%Y'", symbol); - } else if (v == 0) { - errorf(source_position, "zero width for bit-field '%Y'", symbol); + errorf(source_position, "negative width in bit-field '%Y'", + user_symbol); + } else if (v == 0 && symbol != NULL) { + errorf(source_position, "zero width for bit-field '%Y'", + user_symbol); } else if (bit_size > 0 && (il_size_t)v > bit_size) { - errorf(source_position, "width of '%Y' exceeds its type", symbol); + errorf(source_position, "width of '%Y' exceeds its type", + user_symbol); } else { type->bitfield.bit_size = v; } @@ -6496,12 +5807,12 @@ static entity_t *find_compound_entry(compound_t *compound, symbol_t *symbol) if (iter->base.symbol == symbol) { return iter; } else if (iter->base.symbol == NULL) { + /* search in anonymous structs and unions */ type_t *type = skip_typeref(iter->declaration.type); if (is_type_compound(type)) { - entity_t *result - = find_compound_entry(type->compound.compound, symbol); - if (result != NULL) - return result; + if (find_compound_entry(type->compound.compound, symbol) + != NULL) + return iter; } continue; } @@ -6510,6 +5821,98 @@ static entity_t *find_compound_entry(compound_t *compound, symbol_t *symbol) return NULL; } +static void check_deprecated(const source_position_t *source_position, + const entity_t *entity) +{ + if (!warning.deprecated_declarations) + return; + if (!is_declaration(entity)) + return; + if ((entity->declaration.modifiers & DM_DEPRECATED) == 0) + return; + + char const *const prefix = get_entity_kind_name(entity->kind); + const char *deprecated_string + = get_deprecated_string(entity->declaration.attributes); + if (deprecated_string != NULL) { + warningf(source_position, "%s '%Y' is deprecated (declared %P): \"%s\"", + prefix, entity->base.symbol, &entity->base.source_position, + deprecated_string); + } else { + warningf(source_position, "%s '%Y' is deprecated (declared %P)", prefix, + entity->base.symbol, &entity->base.source_position); + } +} + + +static expression_t *create_select(const source_position_t *pos, + expression_t *addr, + type_qualifiers_t qualifiers, + entity_t *entry) +{ + assert(entry->kind == ENTITY_COMPOUND_MEMBER); + + check_deprecated(pos, entry); + + expression_t *select = allocate_expression_zero(EXPR_SELECT); + select->select.compound = addr; + select->select.compound_entry = entry; + + type_t *entry_type = entry->declaration.type; + type_t *res_type = get_qualified_type(entry_type, qualifiers); + + /* we always do the auto-type conversions; the & and sizeof parser contains + * code to revert this! */ + select->base.type = automatic_type_conversion(res_type); + if (res_type->kind == TYPE_BITFIELD) { + select->base.type = res_type->bitfield.base_type; + } + + return select; +} + +/** + * Find entry with symbol in compound. Search anonymous structs and unions and + * creates implicit select expressions for them. + * Returns the adress for the innermost compound. + */ +static expression_t *find_create_select(const source_position_t *pos, + expression_t *addr, + type_qualifiers_t qualifiers, + compound_t *compound, symbol_t *symbol) +{ + entity_t *iter = compound->members.entities; + for (; iter != NULL; iter = iter->base.next) { + if (iter->kind != ENTITY_COMPOUND_MEMBER) + continue; + + symbol_t *iter_symbol = iter->base.symbol; + if (iter_symbol == NULL) { + type_t *type = iter->declaration.type; + if (type->kind != TYPE_COMPOUND_STRUCT + && type->kind != TYPE_COMPOUND_UNION) + continue; + + compound_t *sub_compound = type->compound.compound; + + if (find_compound_entry(sub_compound, symbol) == NULL) + continue; + + expression_t *sub_addr = create_select(pos, addr, qualifiers, iter); + sub_addr->base.source_position = *pos; + sub_addr->select.implicit = true; + return find_create_select(pos, sub_addr, qualifiers, sub_compound, + symbol); + } + + if (iter_symbol == symbol) { + return create_select(pos, addr, qualifiers, iter); + } + } + + return NULL; +} + static void parse_compound_declarators(compound_t *compound, const declaration_specifiers_t *specifiers) { @@ -6524,15 +5927,29 @@ static void parse_compound_declarators(compound_t *compound, expression_t *size = parse_constant_expression(); type_t *type = make_bitfield_type(base_type, size, - &source_position, sym_anonymous); + &source_position, NULL); + + attribute_t *attributes = parse_attributes(NULL); + if (attributes != NULL) { + attribute_t *last = attributes; + while (last->next != NULL) + last = last->next; + last->next = specifiers->attributes; + } else { + attributes = specifiers->attributes; + } entity = allocate_entity_zero(ENTITY_COMPOUND_MEMBER); entity->base.namespc = NAMESPACE_NORMAL; entity->base.source_position = source_position; entity->declaration.declared_storage_class = STORAGE_CLASS_NONE; entity->declaration.storage_class = STORAGE_CLASS_NONE; - entity->declaration.modifiers = specifiers->modifiers; entity->declaration.type = type; + entity->declaration.attributes = attributes; + + if (attributes != NULL) { + handle_entity_attributes(attributes, entity); + } append_entity(&compound->members, entity); } else { entity = parse_declarator(specifiers, @@ -6562,7 +5979,10 @@ static void parse_compound_declarators(compound_t *compound, type_t *type = entity->declaration.type; type_t *bitfield_type = make_bitfield_type(type, size, &source_position, entity->base.symbol); + + attribute_t *attributes = parse_attributes(NULL); entity->declaration.type = bitfield_type; + handle_entity_attributes(attributes, entity); } else { type_t *orig_type = entity->declaration.type; type_t *type = skip_typeref(orig_type); @@ -6894,9 +6314,7 @@ static type_t *make_function_0_type_noreturn(type_t *return_type) type_t *type = allocate_type_zero(TYPE_FUNCTION); type->function.return_type = return_type; type->function.parameters = NULL; - type->function.base.modifiers |= DM_NORETURN; - return type; - + type->function.modifiers |= DM_NORETURN; return identify_new_type(type); } @@ -7011,11 +6429,6 @@ static expression_t *parse_reference(void) orig_type = entity->declaration.type; } else if (entity->kind == ENTITY_ENUM_VALUE) { orig_type = entity->enum_value.enum_type; - } else if (entity->kind == ENTITY_TYPEDEF) { - errorf(HERE, "encountered typedef name '%Y' while parsing expression", - symbol); - next_token(); - return create_invalid_expression(); } else { panic("expected declaration or enum value in reference"); } @@ -7038,7 +6451,7 @@ static expression_t *parse_reference(void) } if (entity->base.parent_scope != file_scope - && entity->base.parent_scope->depth < current_function->parameters.depth + && (current_function != NULL && entity->base.parent_scope->depth < current_function->parameters.depth) && is_type_valid(orig_type) && !is_type_function(orig_type)) { if (entity->kind == ENTITY_VARIABLE) { /* access of a variable from an outer function */ @@ -7049,24 +6462,7 @@ static expression_t *parse_reference(void) current_function->need_closure = true; } - /* check for deprecated functions */ - if (warning.deprecated_declarations - && is_declaration(entity) - && entity->declaration.modifiers & DM_DEPRECATED) { - declaration_t *declaration = &entity->declaration; - - char const *const prefix = entity->kind == ENTITY_FUNCTION ? - "function" : "variable"; - - if (declaration->deprecated_string != NULL) { - warningf(HERE, "%s '%Y' is deprecated (declared %P): \"%s\"", - prefix, entity->base.symbol, &entity->base.source_position, - declaration->deprecated_string); - } else { - warningf(HERE, "%s '%Y' is deprecated (declared %P)", prefix, - entity->base.symbol, &entity->base.source_position); - } - } + check_deprecated(HERE, entity); if (warning.init_self && entity == current_init_decl && !in_type_prop && entity->kind == ENTITY_VARIABLE) { @@ -7437,7 +6833,7 @@ end_error: } /** - * Parses a _builtin_va_arg() expression. + * Parses a __builtin_va_arg() expression. */ static expression_t *parse_va_arg(void) { @@ -7446,7 +6842,11 @@ static expression_t *parse_va_arg(void) eat(T___builtin_va_arg); expect('(', end_error); - expression->va_arge.ap = parse_assignment_expression(); + call_argument_t ap; + ap.expression = parse_assignment_expression(); + expression->va_arge.ap = ap.expression; + check_call_argument(type_valist, &ap, 1); + expect(',', end_error); expression->base.type = parse_typename(); expect(')', end_error); @@ -7456,6 +6856,35 @@ end_error: return create_invalid_expression(); } +/** + * Parses a __builtin_va_copy() expression. + */ +static expression_t *parse_va_copy(void) +{ + expression_t *expression = allocate_expression_zero(EXPR_VA_COPY); + + eat(T___builtin_va_copy); + + expect('(', end_error); + expression_t *dst = parse_assignment_expression(); + assign_error_t error = semantic_assign(type_valist, dst); + report_assign_error(error, type_valist, dst, "call argument 1", + &dst->base.source_position); + expression->va_copye.dst = dst; + + expect(',', end_error); + + call_argument_t src; + src.expression = parse_assignment_expression(); + check_call_argument(type_valist, &src, 2); + expression->va_copye.src = src.expression; + expect(')', end_error); + + return expression; +end_error: + return create_invalid_expression(); +} + /** * Parses a __builtin_constant_p() expression. */ @@ -7722,7 +7151,6 @@ static expression_t *parse_primary_expression(void) case T_FLOATINGPOINT: return parse_float_const(); case T_STRING_LITERAL: case T_WIDE_STRING_LITERAL: return parse_string_const(); - case T_IDENTIFIER: return parse_reference(); case T___FUNCTION__: case T___func__: return parse_function_keyword(); case T___PRETTY_FUNCTION__: return parse_pretty_function_keyword(); @@ -7731,6 +7159,7 @@ static expression_t *parse_primary_expression(void) case T___builtin_offsetof: return parse_offsetof(); case T___builtin_va_start: return parse_va_start(); case T___builtin_va_arg: return parse_va_arg(); + case T___builtin_va_copy: return parse_va_copy(); case T___builtin_isgreater: case T___builtin_isgreaterequal: case T___builtin_isless: @@ -7747,6 +7176,19 @@ static expression_t *parse_primary_expression(void) case '(': return parse_parenthesized_expression(); case T___noop: return parse_noop_expression(); + + /* Gracefully handle type names while parsing expressions. */ + case T_IDENTIFIER: + if (!is_typedef_symbol(token.v.symbol)) { + return parse_reference(); + } + /* FALLTHROUGH */ + TYPENAME_START { + source_position_t const pos = *HERE; + type_t const *const type = parse_typename(); + errorf(&pos, "encountered type '%T' while parsing expression", type); + return create_invalid_expression(); + } } errorf(HERE, "unexpected token %K, expected an expression", &token); @@ -7881,29 +7323,26 @@ static expression_t *parse_alignof(void) return parse_typeprop(EXPR_ALIGNOF); } -static expression_t *parse_select_expression(expression_t *compound) +static expression_t *parse_select_expression(expression_t *addr) { - expression_t *select = allocate_expression_zero(EXPR_SELECT); - select->select.compound = compound; - assert(token.type == '.' || token.type == T_MINUSGREATER); - bool is_pointer = (token.type == T_MINUSGREATER); + bool select_left_arrow = (token.type == T_MINUSGREATER); next_token(); if (token.type != T_IDENTIFIER) { parse_error_expected("while parsing select", T_IDENTIFIER, NULL); - return select; + return create_invalid_expression(); } symbol_t *symbol = token.v.symbol; next_token(); - type_t *const orig_type = compound->base.type; + type_t *const orig_type = addr->base.type; type_t *const type = skip_typeref(orig_type); type_t *type_left; bool saw_error = false; if (is_type_pointer(type)) { - if (!is_pointer) { + if (!select_left_arrow) { errorf(HERE, "request for member '%Y' in something not a struct or union, but '%T'", symbol, orig_type); @@ -7911,62 +7350,46 @@ static expression_t *parse_select_expression(expression_t *compound) } type_left = skip_typeref(type->pointer.points_to); } else { - if (is_pointer && is_type_valid(type)) { + if (select_left_arrow && is_type_valid(type)) { errorf(HERE, "left hand side of '->' is not a pointer, but '%T'", orig_type); saw_error = true; } type_left = type; } - entity_t *entry; - if (type_left->kind == TYPE_COMPOUND_STRUCT || - type_left->kind == TYPE_COMPOUND_UNION) { - compound_t *compound = type_left->compound.compound; + if (type_left->kind != TYPE_COMPOUND_STRUCT && + type_left->kind != TYPE_COMPOUND_UNION) { - if (!compound->complete) { - errorf(HERE, "request for member '%Y' of incomplete type '%T'", - symbol, type_left); - goto create_error_entry; - } - - entry = find_compound_entry(compound, symbol); - if (entry == NULL) { - errorf(HERE, "'%T' has no member named '%Y'", orig_type, symbol); - goto create_error_entry; - } - } else { if (is_type_valid(type_left) && !saw_error) { errorf(HERE, "request for member '%Y' in something not a struct or union, but '%T'", symbol, type_left); } -create_error_entry: - entry = create_error_entity(symbol, ENTITY_COMPOUND_MEMBER); + return create_invalid_expression(); } - assert(is_declaration(entry)); - select->select.compound_entry = entry; - - type_t *entry_type = entry->declaration.type; - type_t *res_type - = get_qualified_type(entry_type, type_left->base.qualifiers); + compound_t *compound = type_left->compound.compound; + if (!compound->complete) { + errorf(HERE, "request for member '%Y' in incomplete type '%T'", + symbol, type_left); + return create_invalid_expression(); + } - /* we always do the auto-type conversions; the & and sizeof parser contains - * code to revert this! */ - select->base.type = automatic_type_conversion(res_type); + type_qualifiers_t qualifiers = type_left->base.qualifiers; + expression_t *result + = find_create_select(HERE, addr, qualifiers, compound, symbol); - type_t *skipped = skip_typeref(res_type); - if (skipped->kind == TYPE_BITFIELD) { - select->base.type = skipped->bitfield.base_type; + if (result == NULL) { + errorf(HERE, "'%T' has no member named '%Y'", orig_type, symbol); + return create_invalid_expression(); } - return select; + return result; } -static void check_call_argument(const function_parameter_t *parameter, +static void check_call_argument(type_t *expected_type, call_argument_t *argument, unsigned pos) { - type_t *expected_type = parameter->type; type_t *expected_type_skip = skip_typeref(expected_type); assign_error_t error = ASSIGN_ERROR_INCOMPATIBLE; expression_t *arg_expr = argument->expression; @@ -7974,8 +7397,7 @@ static void check_call_argument(const function_parameter_t *parameter, /* handle transparent union gnu extension */ if (is_type_union(expected_type_skip) - && (expected_type_skip->base.modifiers - & TYPE_MODIFIER_TRANSPARENT_UNION)) { + && (get_type_modifiers(expected_type) & DM_TRANSPARENT_UNION)) { compound_t *union_decl = expected_type_skip->compound.compound; type_t *best_type = NULL; entity_t *entry = union_decl->members.entities; @@ -8000,8 +7422,7 @@ static void check_call_argument(const function_parameter_t *parameter, } error = semantic_assign(expected_type, arg_expr); - argument->expression = create_implicit_cast(argument->expression, - expected_type); + argument->expression = create_implicit_cast(arg_expr, expected_type); if (error != ASSIGN_SUCCESS) { /* report exact scope in error messages (like "in argument 3") */ @@ -8092,7 +7513,9 @@ static expression_t *parse_call_expression(expression_t *expression) } if (function_type == NULL && is_type_valid(type)) { - errorf(HERE, "called object '%E' (type '%T') is not a pointer to a function", expression, orig_type); + errorf(HERE, + "called object '%E' (type '%T') is not a pointer to a function", + expression, orig_type); } /* parse arguments */ @@ -8121,12 +7544,13 @@ static expression_t *parse_call_expression(expression_t *expression) if (function_type == NULL) return result; + /* check type and count of call arguments */ function_parameter_t *parameter = function_type->parameters; call_argument_t *argument = call->arguments; if (!function_type->unspecified_parameters) { for (unsigned pos = 0; parameter != NULL && argument != NULL; parameter = parameter->next, argument = argument->next) { - check_call_argument(parameter, argument, ++pos); + check_call_argument(parameter->type, argument, ++pos); } if (parameter != NULL) { @@ -8136,7 +7560,7 @@ static expression_t *parse_call_expression(expression_t *expression) } } - /* do default promotion */ + /* do default promotion for other arguments */ for (; argument != NULL; argument = argument->next) { type_t *type = argument->expression->base.type; @@ -8844,7 +8268,7 @@ static void warn_div_by_zero(binary_expression_t const *const expression) /* The type of the right operand can be different for /= */ if (is_type_integer(right->base.type) && is_constant_expression(right) && - fold_constant(right) == 0) { + !fold_constant_to_bool(right)) { warningf(&expression->base.source_position, "division by zero"); } } @@ -8874,7 +8298,7 @@ static void warn_addsub_in_shift(const expression_t *const expr) "suggest parentheses around '%c' inside shift", op); } -static void semantic_shift_op(binary_expression_t *expression) +static bool semantic_shift(binary_expression_t *expression) { expression_t *const left = expression->left; expression_t *const right = expression->right; @@ -8889,19 +8313,47 @@ static void semantic_shift_op(binary_expression_t *expression) errorf(&expression->base.source_position, "operands of shift operation must have integer types"); } - return; + return false; } + type_left = promote_integer(type_left); + + if (is_constant_expression(right)) { + long count = fold_constant_to_int(right); + if (count < 0) { + warningf(&right->base.source_position, + "shift count must be non-negative"); + } else if ((unsigned long)count >= + get_atomic_type_size(type_left->atomic.akind) * 8) { + warningf(&right->base.source_position, + "shift count must be less than type width"); + } + } + + type_right = promote_integer(type_right); + expression->right = create_implicit_cast(right, type_right); + + return true; +} + +static void semantic_shift_op(binary_expression_t *expression) +{ + expression_t *const left = expression->left; + expression_t *const right = expression->right; + + if (!semantic_shift(expression)) + return; + if (warning.parentheses) { warn_addsub_in_shift(left); warn_addsub_in_shift(right); } - type_left = promote_integer(type_left); - type_right = promote_integer(type_right); + type_t *const orig_type_left = left->base.type; + type_t * type_left = skip_typeref(orig_type_left); + type_left = promote_integer(type_left); expression->left = create_implicit_cast(left, type_left); - expression->right = create_implicit_cast(right, type_right); expression->base.type = type_left; } @@ -9016,7 +8468,7 @@ static bool maybe_negative(expression_t const *const expr) { return !is_constant_expression(expr) || - fold_constant(expr) < 0; + fold_constant_to_int(expr) < 0; } /** @@ -9229,6 +8681,50 @@ static void semantic_arithmetic_addsubb_assign(binary_expression_t *expression) } } +static void semantic_integer_assign(binary_expression_t *expression) +{ + expression_t *left = expression->left; + expression_t *right = expression->right; + type_t *orig_type_left = left->base.type; + type_t *orig_type_right = right->base.type; + + if (!is_valid_assignment_lhs(left)) + return; + + type_t *type_left = skip_typeref(orig_type_left); + type_t *type_right = skip_typeref(orig_type_right); + + if (!is_type_integer(type_left) || !is_type_integer(type_right)) { + /* TODO: improve error message */ + if (is_type_valid(type_left) && is_type_valid(type_right)) { + errorf(&expression->base.source_position, + "operation needs integer types"); + } + return; + } + + /* combined instructions are tricky. We can't create an implicit cast on + * the left side, because we need the uncasted form for the store. + * The ast2firm pass has to know that left_type must be right_type + * for the arithmetic operation and create a cast by itself */ + type_t *arithmetic_type = semantic_arithmetic(type_left, type_right); + expression->right = create_implicit_cast(right, arithmetic_type); + expression->base.type = type_left; +} + +static void semantic_shift_assign(binary_expression_t *expression) +{ + expression_t *left = expression->left; + + if (!is_valid_assignment_lhs(left)) + return; + + if (!semantic_shift(expression)) + return; + + expression->base.type = skip_typeref(left->base.type); +} + static void warn_logical_and_within_or(const expression_t *const expr) { if (expr->base.kind != EXPR_BINARY_LOGICAL_AND) @@ -9334,6 +8830,7 @@ static bool expression_has_effect(const expression_t *const expr) case EXPR_OFFSETOF: return false; case EXPR_VA_START: return true; case EXPR_VA_ARG: return true; + case EXPR_VA_COPY: return true; case EXPR_STATEMENT: return true; // TODO case EXPR_COMPOUND_LITERAL: return false; @@ -9464,11 +8961,11 @@ CREATE_BINEXPR_PARSER(T_MINUSEQUAL, EXPR_BINARY_SUB_ASSIGN, PR CREATE_BINEXPR_PARSER(T_ASTERISKEQUAL, EXPR_BINARY_MUL_ASSIGN, PREC_ASSIGNMENT, semantic_arithmetic_assign) CREATE_BINEXPR_PARSER(T_SLASHEQUAL, EXPR_BINARY_DIV_ASSIGN, PREC_ASSIGNMENT, semantic_divmod_assign) CREATE_BINEXPR_PARSER(T_PERCENTEQUAL, EXPR_BINARY_MOD_ASSIGN, PREC_ASSIGNMENT, semantic_divmod_assign) -CREATE_BINEXPR_PARSER(T_LESSLESSEQUAL, EXPR_BINARY_SHIFTLEFT_ASSIGN, PREC_ASSIGNMENT, semantic_arithmetic_assign) -CREATE_BINEXPR_PARSER(T_GREATERGREATEREQUAL, EXPR_BINARY_SHIFTRIGHT_ASSIGN, PREC_ASSIGNMENT, semantic_arithmetic_assign) -CREATE_BINEXPR_PARSER(T_ANDEQUAL, EXPR_BINARY_BITWISE_AND_ASSIGN, PREC_ASSIGNMENT, semantic_arithmetic_assign) -CREATE_BINEXPR_PARSER(T_PIPEEQUAL, EXPR_BINARY_BITWISE_OR_ASSIGN, PREC_ASSIGNMENT, semantic_arithmetic_assign) -CREATE_BINEXPR_PARSER(T_CARETEQUAL, EXPR_BINARY_BITWISE_XOR_ASSIGN, PREC_ASSIGNMENT, semantic_arithmetic_assign) +CREATE_BINEXPR_PARSER(T_LESSLESSEQUAL, EXPR_BINARY_SHIFTLEFT_ASSIGN, PREC_ASSIGNMENT, semantic_shift_assign) +CREATE_BINEXPR_PARSER(T_GREATERGREATEREQUAL, EXPR_BINARY_SHIFTRIGHT_ASSIGN, PREC_ASSIGNMENT, semantic_shift_assign) +CREATE_BINEXPR_PARSER(T_ANDEQUAL, EXPR_BINARY_BITWISE_AND_ASSIGN, PREC_ASSIGNMENT, semantic_integer_assign) +CREATE_BINEXPR_PARSER(T_PIPEEQUAL, EXPR_BINARY_BITWISE_OR_ASSIGN, PREC_ASSIGNMENT, semantic_integer_assign) +CREATE_BINEXPR_PARSER(T_CARETEQUAL, EXPR_BINARY_BITWISE_XOR_ASSIGN, PREC_ASSIGNMENT, semantic_integer_assign) CREATE_BINEXPR_PARSER(',', EXPR_BINARY_COMMA, PREC_ASSIGNMENT, semantic_comma) @@ -9829,7 +9326,7 @@ static statement_t *parse_case_statement(void) } statement->case_label.is_bad = true; } else { - long const val = fold_constant(expression); + long const val = fold_constant_to_int(expression); statement->case_label.first_case = val; statement->case_label.last_case = val; } @@ -9848,7 +9345,7 @@ static statement_t *parse_case_statement(void) } statement->case_label.is_bad = true; } else { - long const val = fold_constant(end_range); + long const val = fold_constant_to_int(end_range); statement->case_label.last_case = val; if (warning.other && val < statement->case_label.first_case) { @@ -10076,7 +9573,7 @@ static void check_enum_cases(const switch_statement_t *statement) for (; entry != NULL && entry->kind == ENTITY_ENUM_VALUE; entry = entry->base.next) { const expression_t *expression = entry->enum_value.value; - long value = expression != NULL ? fold_constant(expression) : last_value + 1; + long value = expression != NULL ? fold_constant_to_int(expression) : last_value + 1; bool found = false; for (const case_label_statement_t *l = statement->first_case; l != NULL; l = l->next) { if (l->expression == NULL) @@ -10242,6 +9739,12 @@ static statement_t *parse_for(void) size_t const top = environment_top(); scope_t *old_scope = scope_push(&statement->fors.scope); + bool old_gcc_extension = in_gcc_extension; + while (token.type == T___extension__) { + next_token(); + in_gcc_extension = true; + } + if (token.type == ';') { next_token(); } else if (is_declaration_specifier(&token, false)) { @@ -10258,6 +9761,7 @@ static statement_t *parse_for(void) rem_anchor_token(';'); expect(';', end_error2); } + in_gcc_extension = old_gcc_extension; if (token.type != ';') { add_anchor_token(';'); @@ -10331,19 +9835,17 @@ static statement_t *parse_goto(void) } statement->gotos.expression = expression; - } else { - if (token.type != T_IDENTIFIER) { - if (GNU_MODE) - parse_error_expected("while parsing goto", T_IDENTIFIER, '*', NULL); - else - parse_error_expected("while parsing goto", T_IDENTIFIER, NULL); - eat_until_anchor(); - goto end_error; - } + } else if (token.type == T_IDENTIFIER) { symbol_t *symbol = token.v.symbol; next_token(); - statement->gotos.label = get_label(symbol); + } else { + if (GNU_MODE) + parse_error_expected("while parsing goto", T_IDENTIFIER, '*', NULL); + else + parse_error_expected("while parsing goto", T_IDENTIFIER, NULL); + eat_until_anchor(); + goto end_error; } /* remember the goto's in a list for later checking */ @@ -10500,10 +10002,10 @@ static statement_t *parse_return(void) /* Only warn in C mode, because GCC does the same */ if (strict_mode) { errorf(pos, - "'return' with expression in function return 'void'"); + "'return' with expression in function returning 'void'"); } else if (warning.other) { warningf(pos, - "'return' with expression in function return 'void'"); + "'return' with expression in function returning 'void'"); } } } else { @@ -11457,9 +10959,10 @@ static void create_microsoft_intrinsics(void) MS_BUILTIN(_byteswap_ulong, make_function_1_type(type_unsigned_long, type_unsigned_long)); MS_BUILTIN(_byteswap_uint64, make_function_1_type(type_unsigned_int64, type_unsigned_int64)); - MS_BUILTIN(__debugbreak, make_function_0_type(type_void)); - MS_BUILTIN(_ReturnAddress, make_function_0_type(type_void_ptr)); - MS_BUILTIN(__popcount, make_function_1_type(type_unsigned_int, type_unsigned_int)); + MS_BUILTIN(__debugbreak, make_function_0_type(type_void)); + MS_BUILTIN(_ReturnAddress, make_function_0_type(type_void_ptr)); + MS_BUILTIN(_AddressOfReturnAddress, make_function_0_type(type_void_ptr)); + MS_BUILTIN(__popcount, make_function_1_type(type_unsigned_int, type_unsigned_int)); /* x86/x64 only */ MS_BUILTIN(_enable, make_function_0_type(type_void)); @@ -11494,28 +10997,6 @@ void init_parser(void) { sym_anonymous = symbol_table_insert(""); - if (c_mode & _MS) { - /* add predefined symbols for extended-decl-modifier */ - sym_align = symbol_table_insert("align"); - sym_allocate = symbol_table_insert("allocate"); - sym_dllimport = symbol_table_insert("dllimport"); - sym_dllexport = symbol_table_insert("dllexport"); - sym_naked = symbol_table_insert("naked"); - sym_noinline = symbol_table_insert("noinline"); - sym_returns_twice = symbol_table_insert("returns_twice"); - sym_noreturn = symbol_table_insert("noreturn"); - sym_nothrow = symbol_table_insert("nothrow"); - sym_novtable = symbol_table_insert("novtable"); - sym_property = symbol_table_insert("property"); - sym_get = symbol_table_insert("get"); - sym_put = symbol_table_insert("put"); - sym_selectany = symbol_table_insert("selectany"); - sym_thread = symbol_table_insert("thread"); - sym_uuid = symbol_table_insert("uuid"); - sym_deprecated = symbol_table_insert("deprecated"); - sym_restrict = symbol_table_insert("restrict"); - sym_noalias = symbol_table_insert("noalias"); - } memset(token_anchor_set, 0, sizeof(token_anchor_set)); init_expression_parsers();