X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=parser.c;h=fdaabbee34636d2df2f51e136c5baf201717d694;hb=062550d93a3ee900a2aa9f57cf8bf1a378dcf3dc;hp=c550062bd6eea5c23579d3878a64d6dc22360f66;hpb=8e08a25823bf16d286ea0dc2fb5a9ea25a3e66fa;p=cparser diff --git a/parser.c b/parser.c index c550062..fdaabbe 100644 --- a/parser.c +++ b/parser.c @@ -58,14 +58,14 @@ struct argument_list_t { 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_kind_t kind; /**< The kind of the GNU attribute. */ gnu_attribute_t *next; - bool invalid; /**< Set if this attribute had argument errors, */ - bool have_arguments; /**< True, if this attribute has arguments. */ + 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; - atomic_type_kind_t akind; + symbol_t *symbol; long argument; /**< Single argument. */ argument_list_t *arguments; /**< List of argument expressions. */ } u; @@ -113,7 +113,7 @@ static token_t token; /** The lookahead ring-buffer. */ static token_t lookahead_buffer[MAX_LOOKAHEAD]; /** Position of the next token in the lookahead buffer. */ -static int lookahead_bufpos; +static size_t lookahead_bufpos; static stack_entry_t *environment_stack = NULL; static stack_entry_t *label_stack = NULL; static scope_t *file_scope = NULL; @@ -150,24 +150,25 @@ static declaration_t **incomplete_arrays; 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_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; +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]; @@ -247,6 +248,7 @@ static void semantic_comparison(binary_expression_t *expression); case T_union: \ case T_unsigned: \ case T_void: \ + case T_wchar_t: \ COMPLEX_SPECIFIERS \ IMAGINARY_SPECIFIERS @@ -379,7 +381,6 @@ static size_t get_statement_struct_size(statement_kind_t kind) [STATEMENT_COMPOUND] = sizeof(compound_statement_t), [STATEMENT_RETURN] = sizeof(return_statement_t), [STATEMENT_DECLARATION] = sizeof(declaration_statement_t), - [STATEMENT_LOCAL_LABEL] = sizeof(local_label_statement_t), [STATEMENT_IF] = sizeof(if_statement_t), [STATEMENT_SWITCH] = sizeof(switch_statement_t), [STATEMENT_EXPRESSION] = sizeof(expression_statement_t), @@ -578,14 +579,6 @@ static initializer_t *allocate_initializer_zero(initializer_kind_t kind) return result; } -/** - * Free a type from the type obstack. - */ -static void free_type(void *type) -{ - obstack_free(type_obst, type); -} - /** * Returns the index of the top element of the environment stack. */ @@ -611,7 +604,7 @@ static inline void next_token(void) lookahead_buffer[lookahead_bufpos] = lexer_token; lexer_next_token(); - lookahead_bufpos = (lookahead_bufpos+1) % MAX_LOOKAHEAD; + lookahead_bufpos = (lookahead_bufpos + 1) % MAX_LOOKAHEAD; #ifdef PRINT_TOKENS print_token(stderr, &token); @@ -622,10 +615,10 @@ static inline void next_token(void) /** * Return the next token with a given lookahead. */ -static inline const token_t *look_ahead(int num) +static inline const token_t *look_ahead(size_t num) { - assert(num > 0 && num <= MAX_LOOKAHEAD); - int pos = (lookahead_bufpos+num-1) % MAX_LOOKAHEAD; + assert(0 < num && num <= MAX_LOOKAHEAD); + size_t pos = (lookahead_bufpos + num - 1) % MAX_LOOKAHEAD; return &lookahead_buffer[pos]; } @@ -756,7 +749,7 @@ static void eat_block(void) next_token(); } -#define eat(token_type) do { assert(token.type == (token_type)); next_token(); } while (0) +#define eat(token_type) (assert(token.type == (token_type)), next_token()) /** * Report a parse error because an expected token was not found. @@ -791,7 +784,7 @@ static void type_error_incompatible(const char *msg, * If not, generate an error, eat the current statement, * and goto the end_error label. */ -#define expect(expected) \ +#define expect(expected, error_label) \ do { \ if (UNLIKELY(token.type != (expected))) { \ parse_error_expected(NULL, (expected), NULL); \ @@ -800,7 +793,7 @@ static void type_error_incompatible(const char *msg, if (token.type == expected) \ next_token(); \ rem_anchor_token(expected); \ - goto end_error; \ + goto error_label; \ } \ next_token(); \ } while (0) @@ -976,13 +969,8 @@ static int get_akind_rank(atomic_type_kind_t akind) static int get_rank(const type_t *type) { assert(!is_typeref(type)); - /* The C-standard allows promoting enums to int or unsigned int (see § 7.2.2 - * and esp. footnote 108). However we can't fold constants (yet), so we - * can't decide whether unsigned int is possible, while int always works. - * (unsigned int would be preferable when possible... for stuff like - * struct { enum { ... } bla : 4; } ) */ if (type->kind == TYPE_ENUM) - return get_akind_rank(ATOMIC_TYPE_INT); + return get_akind_rank(type->enumt.akind); assert(type->kind == TYPE_ATOMIC); return get_akind_rank(type->atomic.akind); @@ -1030,21 +1018,18 @@ static expression_t *create_cast_expression(expression_t *expression, static bool is_null_pointer_constant(const expression_t *expression) { /* skip void* cast */ - if (expression->kind == EXPR_UNARY_CAST - || expression->kind == EXPR_UNARY_CAST_IMPLICIT) { - expression = expression->unary.value; + if (expression->kind == EXPR_UNARY_CAST || + expression->kind == EXPR_UNARY_CAST_IMPLICIT) { + type_t *const type = skip_typeref(expression->base.type); + if (types_compatible(type, type_void_ptr)) + expression = expression->unary.value; } - /* TODO: not correct yet, should be any constant integer expression - * which evaluates to 0 */ - if (expression->kind != EXPR_CONST) - return false; - type_t *const type = skip_typeref(expression->base.type); - if (!is_type_integer(type)) - return false; - - return expression->conste.v.int_value == 0; + return + is_type_integer(type) && + is_constant_expression(expression) && + fold_constant(expression) == 0; } /** @@ -1240,6 +1225,7 @@ static const char *const gnu_attribute_names[GNU_AK_LAST] = { [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", @@ -1325,7 +1311,7 @@ static gnu_attribute_t *allocate_gnu_attribute(gnu_attribute_kind_t kind) attribute->kind = kind; attribute->next = NULL; attribute->invalid = false; - attribute->have_arguments = false; + attribute->has_arguments = false; return attribute; } @@ -1339,7 +1325,7 @@ static void parse_gnu_attribute_const_arg(gnu_attribute_t *attribute) add_anchor_token(')'); expression = parse_constant_expression(); rem_anchor_token(')'); - expect(')'); + expect(')', end_error); attribute->u.argument = fold_constant(expression); return; end_error: @@ -1369,7 +1355,7 @@ static void parse_gnu_attribute_const_arg_list(gnu_attribute_t *attribute) } rem_anchor_token(','); rem_anchor_token(')'); - expect(')'); + expect(')', end_error); return; end_error: attribute->invalid = true; @@ -1389,7 +1375,7 @@ static void parse_gnu_attribute_string_arg(gnu_attribute_t *attribute, } *string = parse_string_literals(); rem_anchor_token('('); - expect(')'); + expect(')', end_error); return; end_error: attribute->invalid = true; @@ -1474,39 +1460,17 @@ static void parse_gnu_attribute_model_arg(gnu_attribute_t *attribute) */ static void parse_gnu_attribute_mode_arg(gnu_attribute_t *attribute) { - /* TODO: find out what is allowed here... */ - - /* at least: byte, word, pointer, list of machine modes - * __XXX___ is interpreted as XXX */ add_anchor_token(')'); if (token.type != T_IDENTIFIER) { - expect(T_IDENTIFIER); + expect(T_IDENTIFIER, end_error); } - /* 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 = token.v.symbol->string; - if (strcmp_underscore("QI", symbol_str) == 0 || - strcmp_underscore("byte", symbol_str) == 0) { - attribute->u.akind = ATOMIC_TYPE_CHAR; - } else if (strcmp_underscore("HI", symbol_str) == 0) { - attribute->u.akind = ATOMIC_TYPE_SHORT; - } else if (strcmp_underscore("SI", symbol_str) == 0 - || strcmp_underscore("word", symbol_str) == 0 - || strcmp_underscore("pointer", symbol_str) == 0) { - attribute->u.akind = ATOMIC_TYPE_INT; - } else if (strcmp_underscore("DI", symbol_str) == 0) { - attribute->u.akind = ATOMIC_TYPE_LONGLONG; - } else { - if (warning.other) - warningf(HERE, "ignoring unknown mode '%s'", symbol_str); - attribute->invalid = true; - } + attribute->u.symbol = token.v.symbol; next_token(); rem_anchor_token(')'); - expect(')'); + expect(')', end_error); return; end_error: attribute->invalid = true; @@ -1566,18 +1530,18 @@ static void parse_gnu_attribute_format_args(gnu_attribute_t *attribute) } next_token(); - expect(','); + expect(',', end_error); add_anchor_token(')'); add_anchor_token(','); parse_constant_expression(); rem_anchor_token(','); rem_anchor_token(')'); - expect(','); + expect(',', end_error); add_anchor_token(')'); parse_constant_expression(); rem_anchor_token(')'); - expect(')'); + expect(')', end_error); return; end_error: attribute->u.value = true; @@ -1588,7 +1552,7 @@ end_error: */ static void check_no_argument(gnu_attribute_t *attribute, const char *name) { - if (!attribute->have_arguments) + if (!attribute->has_arguments) return; /* should have no arguments */ @@ -1683,8 +1647,8 @@ static decl_modifiers_t parse_gnu_attribute(gnu_attribute_t **attributes) gnu_attribute_t *attribute; eat(T___attribute__); - expect('('); - expect('('); + expect('(', end_error); + expect('(', end_error); if (token.type != ')') { /* find the end of the list */ @@ -1738,7 +1702,7 @@ static decl_modifiers_t parse_gnu_attribute(gnu_attribute_t **attributes) /* empty args are allowed */ next_token(); } else - attribute->have_arguments = true; + attribute->has_arguments = true; } switch (kind) { @@ -1787,6 +1751,7 @@ static decl_modifiers_t parse_gnu_attribute(gnu_attribute_t **attributes) 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; @@ -1796,7 +1761,7 @@ static decl_modifiers_t parse_gnu_attribute(gnu_attribute_t **attributes) case GNU_AK_ALIGNED: /* __align__ may be used without an argument */ - if (attribute->have_arguments) { + if (attribute->has_arguments) { parse_gnu_attribute_const_arg(attribute); } break; @@ -1804,7 +1769,7 @@ static decl_modifiers_t parse_gnu_attribute(gnu_attribute_t **attributes) case GNU_AK_FORMAT_ARG: case GNU_AK_REGPARM: case GNU_AK_TRAP_EXIT: - if (!attribute->have_arguments) { + if (!attribute->has_arguments) { /* should have arguments */ errorf(HERE, "wrong number of arguments specified for '%s' attribute", name); attribute->invalid = true; @@ -1814,7 +1779,7 @@ static decl_modifiers_t parse_gnu_attribute(gnu_attribute_t **attributes) case GNU_AK_ALIAS: case GNU_AK_SECTION: case GNU_AK_SP_SWITCH: - if (!attribute->have_arguments) { + if (!attribute->has_arguments) { /* should have arguments */ errorf(HERE, "wrong number of arguments specified for '%s' attribute", name); attribute->invalid = true; @@ -1822,7 +1787,7 @@ static decl_modifiers_t parse_gnu_attribute(gnu_attribute_t **attributes) parse_gnu_attribute_string_arg(attribute, &attribute->u.string); break; case GNU_AK_FORMAT: - if (!attribute->have_arguments) { + if (!attribute->has_arguments) { /* should have arguments */ errorf(HERE, "wrong number of arguments specified for '%s' attribute", name); attribute->invalid = true; @@ -1831,29 +1796,29 @@ static decl_modifiers_t parse_gnu_attribute(gnu_attribute_t **attributes) break; case GNU_AK_WEAKREF: /* may have one string argument */ - if (attribute->have_arguments) + if (attribute->has_arguments) parse_gnu_attribute_string_arg(attribute, &attribute->u.string); break; case GNU_AK_NONNULL: - if (attribute->have_arguments) + if (attribute->has_arguments) parse_gnu_attribute_const_arg_list(attribute); break; case GNU_AK_TLS_MODEL: - if (!attribute->have_arguments) { + 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->have_arguments) { + 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->have_arguments) { + if (!attribute->has_arguments) { /* should have arguments */ errorf(HERE, "wrong number of arguments specified for '%s' attribute", name); } else { @@ -1861,7 +1826,7 @@ static decl_modifiers_t parse_gnu_attribute(gnu_attribute_t **attributes) } break; case GNU_AK_MODE: - if (!attribute->have_arguments) { + if (!attribute->has_arguments) { /* should have arguments */ errorf(HERE, "wrong number of arguments specified for '%s' attribute", name); } else { @@ -1870,12 +1835,12 @@ static decl_modifiers_t parse_gnu_attribute(gnu_attribute_t **attributes) break; case GNU_AK_INTERRUPT: /* may have one string argument */ - if (attribute->have_arguments) + if (attribute->has_arguments) parse_gnu_attribute_interrupt_arg(attribute); break; case GNU_AK_SENTINEL: /* may have one string argument */ - if (attribute->have_arguments) + if (attribute->has_arguments) parse_gnu_attribute_const_arg(attribute); break; case GNU_AK_LAST: @@ -1900,8 +1865,8 @@ no_arg: next_token(); } } - expect(')'); - expect(')'); + expect(')', end_error); + expect(')', end_error); end_error: *attributes = head; @@ -1923,7 +1888,7 @@ static decl_modifiers_t parse_attributes(gnu_attribute_t **attributes) case T_asm: next_token(); - expect('('); + expect('(', end_error); if (token.type != T_STRING_LITERAL) { parse_error_expected("while parsing assembler attribute", T_STRING_LITERAL, NULL); @@ -1932,7 +1897,7 @@ static decl_modifiers_t parse_attributes(gnu_attribute_t **attributes) } else { parse_string_literals(); } - expect(')'); + expect(')', end_error); continue; case T_cdecl: modifiers |= DM_CDECL; break; @@ -2200,7 +2165,7 @@ static designator_t *parse_designation(void) add_anchor_token(']'); designator->array_index = parse_constant_expression(); rem_anchor_token(']'); - expect(']'); + expect(']', end_error); break; case '.': designator = allocate_ast_zero(sizeof(designator[0])); @@ -2215,7 +2180,7 @@ static designator_t *parse_designation(void) next_token(); break; default: - expect('='); + expect('=', end_error); return result; } @@ -2282,6 +2247,7 @@ static initializer_t *initializer_from_expression(type_t *orig_type, return initializer_from_string(array_type, &expression->string.value); } + break; case EXPR_WIDE_STRING_LITERAL: { type_t *bare_wchar_type = skip_typeref(type_wchar_t); @@ -2289,6 +2255,7 @@ static initializer_t *initializer_from_expression(type_t *orig_type, return initializer_from_wide_string(array_type, &expression->wide_string.value); } + break; } default: @@ -2773,15 +2740,16 @@ finish_designator: if (type != NULL) { ascend_from_subtype(path); - expect('}'); + expect('}', end_error); } else { - expect('}'); + expect('}', end_error); goto error_parse_next; } } } else { /* must be an expression */ expression_t *expression = parse_assignment_expression(); + mark_vars_read(expression, NULL); if (env->must_be_constant && !is_initializer_constant(expression)) { errorf(&expression->base.source_position, @@ -2869,7 +2837,7 @@ error_parse_next: if (token.type == '}') { break; } - expect(','); + expect(',', end_error); if (token.type == '}') { break; } @@ -2911,9 +2879,9 @@ end_error: */ static initializer_t *parse_initializer(parse_initializer_env_t *env) { - type_t *type = skip_typeref(env->type); - initializer_t *result = NULL; - size_t max_index; + type_t *type = skip_typeref(env->type); + size_t max_index = 0xdeadbeaf; // TODO: Resolve this uninitialized variable problem + initializer_t *result; if (is_type_scalar(type)) { result = parse_scalar_initializer(type, env->must_be_constant); @@ -2934,20 +2902,21 @@ static initializer_t *parse_initializer(parse_initializer_env_t *env) max_index = path.max_index; DEL_ARR_F(path.path); - expect('}'); + expect('}', end_error); } else { /* parse_scalar_initializer() also works in this case: we simply * have an expression without {} around it */ result = parse_scalar_initializer(type, env->must_be_constant); } - /* § 6.7.8 (22) array initializers for arrays with unknown size determine + /* § 6.7.8:22 array initializers for arrays with unknown size determine * the array type size */ if (is_type_array(type) && type->array.size_expression == NULL && result != NULL) { size_t size; switch (result->kind) { case INITIALIZER_LIST: + assert(max_index != 0xdeadbeaf); size = max_index + 1; break; @@ -3027,8 +2996,8 @@ static compound_t *parse_compound_type_specifier(bool is_struct) compound = &entity->compound; if (compound->base.parent_scope != current_scope && (token.type == '{' || token.type == ';')) { - /* we're in an inner scope and have a definition. Override - existing definition in outer scope */ + /* we're in an inner scope and have a definition. Shadow + * existing definition in outer scope */ compound = NULL; } else if (compound->complete && token.type == '{') { assert(symbol != NULL); @@ -3124,7 +3093,7 @@ static void parse_enum_entries(type_t *const enum_type) } while (token.type != '}'); rem_anchor_token('}'); - expect('}'); + expect('}', end_error); end_error: ; @@ -3142,7 +3111,18 @@ static type_t *parse_enum_specifier(void) next_token(); entity = get_entity(symbol, NAMESPACE_ENUM); - assert(entity == NULL || entity->kind == 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 + * existing definition in outer scope */ + entity = NULL; + } else if (entity->enume.complete && token.type == '{') { + errorf(HERE, "multiple definitions of 'enum %Y' (previous definition %P)", + symbol, &entity->base.source_position); + } + } } else if (token.type != '{') { parse_error_expected("while parsing enum type specifier", T_IDENTIFIER, '{', NULL); @@ -3162,12 +3142,9 @@ static type_t *parse_enum_specifier(void) type_t *const type = allocate_type_zero(TYPE_ENUM); type->enumt.enume = &entity->enume; + type->enumt.akind = ATOMIC_TYPE_INT; if (token.type == '{') { - if (entity->enume.complete) { - errorf(HERE, "multiple definitions of enum %Y (previous definition %P)", - symbol, &entity->base.source_position); - } if (symbol != NULL) { environment_push(entity); } @@ -3182,7 +3159,7 @@ static type_t *parse_enum_specifier(void) anonymous_entity = entity; } } else if (!entity->enume.complete && !(c_mode & _GNUC)) { - errorf(HERE, "enum %Y used before definition (incomplete enumes are a GNU extension)", + errorf(HERE, "'enum %Y' used before definition (incomplete enums are a GNU extension)", symbol); } @@ -3204,7 +3181,7 @@ static type_t *parse_typeof(void) type_t *type; - expect('('); + expect('(', end_error); add_anchor_token(')'); expression_t *expression = NULL; @@ -3241,7 +3218,7 @@ static type_t *parse_typeof(void) in_gcc_extension = old_gcc_extension; rem_anchor_token(')'); - expect(')'); + expect(')', end_error); type_t *typeof_type = allocate_type_zero(TYPE_TYPEOF); typeof_type->typeoft.expression = expression; @@ -3259,18 +3236,19 @@ typedef enum specifiers_t { SPECIFIER_INT = 1 << 3, SPECIFIER_DOUBLE = 1 << 4, SPECIFIER_CHAR = 1 << 5, - SPECIFIER_SHORT = 1 << 6, - SPECIFIER_LONG_LONG = 1 << 7, - SPECIFIER_FLOAT = 1 << 8, - SPECIFIER_BOOL = 1 << 9, - SPECIFIER_VOID = 1 << 10, - SPECIFIER_INT8 = 1 << 11, - SPECIFIER_INT16 = 1 << 12, - SPECIFIER_INT32 = 1 << 13, - SPECIFIER_INT64 = 1 << 14, - SPECIFIER_INT128 = 1 << 15, - SPECIFIER_COMPLEX = 1 << 16, - SPECIFIER_IMAGINARY = 1 << 17, + SPECIFIER_WCHAR_T = 1 << 6, + SPECIFIER_SHORT = 1 << 7, + SPECIFIER_LONG_LONG = 1 << 8, + SPECIFIER_FLOAT = 1 << 9, + SPECIFIER_BOOL = 1 << 10, + SPECIFIER_VOID = 1 << 11, + SPECIFIER_INT8 = 1 << 12, + SPECIFIER_INT16 = 1 << 13, + SPECIFIER_INT32 = 1 << 14, + SPECIFIER_INT64 = 1 << 15, + SPECIFIER_INT128 = 1 << 16, + SPECIFIER_COMPLEX = 1 << 17, + SPECIFIER_IMAGINARY = 1 << 18, } specifiers_t; static type_t *create_builtin_type(symbol_t *const symbol, @@ -3279,13 +3257,7 @@ static type_t *create_builtin_type(symbol_t *const symbol, type_t *type = allocate_type_zero(TYPE_BUILTIN); type->builtin.symbol = symbol; type->builtin.real_type = real_type; - - type_t *result = typehash_insert(type); - if (type != result) { - free_type(type); - } - - return result; + return identify_new_type(type); } static type_t *get_typedef_type(symbol_t *symbol) @@ -3337,7 +3309,7 @@ static void parse_microsoft_extended_decl_modifier(declaration_specifiers_t *spe symbol_t *symbol = token.v.symbol; if (symbol == sym_align) { next_token(); - expect('('); + expect('(', end_error); if (token.type != T_INTEGER) goto end_error; if (check_alignment_value(token.v.intvalue)) { @@ -3346,14 +3318,14 @@ static void parse_microsoft_extended_decl_modifier(declaration_specifiers_t *spe specifiers->alignment = (unsigned char)token.v.intvalue; } next_token(); - expect(')'); + expect(')', end_error); } else if (symbol == sym_allocate) { next_token(); - expect('('); + expect('(', end_error); if (token.type != T_IDENTIFIER) goto end_error; (void)token.v.symbol; - expect(')'); + expect(')', end_error); } else if (symbol == sym_dllimport) { next_token(); DET_MOD(dllimport, DM_DLLIMPORT); @@ -3369,6 +3341,9 @@ static void parse_microsoft_extended_decl_modifier(declaration_specifiers_t *spe } 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); @@ -3380,7 +3355,7 @@ static void parse_microsoft_extended_decl_modifier(declaration_specifiers_t *spe DET_MOD(novtable, DM_NOVTABLE); } else if (symbol == sym_property) { next_token(); - expect('('); + expect('(', end_error); for (;;) { bool is_get = false; if (token.type != T_IDENTIFIER) @@ -3393,7 +3368,7 @@ static void parse_microsoft_extended_decl_modifier(declaration_specifiers_t *spe goto end_error; } next_token(); - expect('='); + expect('=', end_error); if (token.type != T_IDENTIFIER) goto end_error; if (is_get) { @@ -3416,17 +3391,17 @@ static void parse_microsoft_extended_decl_modifier(declaration_specifiers_t *spe } break; } - expect(')'); + expect(')', end_error); } else if (symbol == sym_selectany) { next_token(); DET_MOD(selectany, DM_SELECTANY); } else if (symbol == sym_uuid) { next_token(); - expect('('); + expect('(', end_error); if (token.type != T_STRING_LITERAL) goto end_error; next_token(); - expect(')'); + expect(')', end_error); } else if (symbol == sym_deprecated) { next_token(); if (specifiers->deprecated != 0 && warning.other) @@ -3440,14 +3415,14 @@ static void parse_microsoft_extended_decl_modifier(declaration_specifiers_t *spe } else { errorf(HERE, "string literal expected"); } - expect(')'); + expect(')', end_error); } } else if (symbol == sym_noalias) { next_token(); DET_MOD(noalias, DM_NOALIAS); } else { if (warning.other) - warningf(HERE, "Unknown modifier %Y ignored", token.v.symbol); + warningf(HERE, "Unknown modifier '%Y' ignored", token.v.symbol); next_token(); if (token.type == '(') skip_until(')'); @@ -3469,9 +3444,11 @@ static entity_t *create_error_entity(symbol_t *symbol, entity_kind_tag_t kind) entity->declaration.type = type_error_type; entity->declaration.implicit = true; } else if (kind == ENTITY_TYPEDEF) { - entity->typedefe.type = type_error_type; + entity->typedefe.type = type_error_type; + entity->typedefe.builtin = true; } - record_entity(entity, false); + if (kind != ENTITY_COMPOUND_MEMBER) + record_entity(entity, false); return entity; } @@ -3556,14 +3533,15 @@ static void finish_struct_type(compound_type_t *type) if (offset > size) need_pad = true; - if (warning.padded && need_pad) { - warningf(&compound->base.source_position, - "'%#T' needs padding", type, compound->base.symbol); - } - if (warning.packed && !need_pad) { - warningf(&compound->base.source_position, - "superfluous packed attribute on '%#T'", - type, compound->base.symbol); + 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); + } } type->base.size = offset; @@ -3608,6 +3586,78 @@ static void finish_union_type(compound_type_t *type) type->base.alignment = alignment; } +static type_t *handle_attribute_mode(const gnu_attribute_t *attribute, + type_t *orig_type) +{ + type_t *type = skip_typeref(orig_type); + + /* 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 (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; + } + + errorf(HERE, "__attribute__((mode)) only allowed on integer, enum or pointer type"); + return orig_type; +} + +static type_t *handle_type_attributes(const gnu_attribute_t *attributes, + type_t *type) +{ + 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); + } + } + + return type; +} + static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) { type_t *type = NULL; @@ -3623,8 +3673,6 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) while (true) { specifiers->modifiers |= parse_attributes(&specifiers->gnu_attributes); - if (specifiers->modifiers & DM_TRANSPARENT_UNION) - modifiers |= TYPE_MODIFIER_TRANSPARENT_UNION; switch (token.type) { /* storage class */ @@ -3647,11 +3695,11 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) case T__declspec: next_token(); - expect('('); + expect('(', end_error); add_anchor_token(')'); parse_microsoft_extended_decl_modifier(specifiers); rem_anchor_token(')'); - expect(')'); + expect(')', end_error); break; case T___thread: @@ -3727,6 +3775,7 @@ wrong_thread_stoarge_class: MATCH_SPECIFIER(T_signed, SPECIFIER_SIGNED, "signed"); MATCH_SPECIFIER(T_unsigned, SPECIFIER_UNSIGNED, "unsigned"); MATCH_SPECIFIER(T_void, SPECIFIER_VOID, "void"); + MATCH_SPECIFIER(T_wchar_t, SPECIFIER_WCHAR_T, "wchar_t"); case T__forceinline: /* only in microsoft mode */ @@ -3844,6 +3893,9 @@ wrong_thread_stoarge_class: } finish_specifiers: + specifiers->modifiers + |= parse_attributes(&specifiers->gnu_attributes); + in_gcc_extension = old_gcc_extension; if (type == NULL || (saw_error && type_specifiers != 0)) { @@ -3854,6 +3906,9 @@ finish_specifiers: case SPECIFIER_VOID: atomic_type = ATOMIC_TYPE_VOID; break; + case SPECIFIER_WCHAR_T: + atomic_type = ATOMIC_TYPE_WCHAR_T; + break; case SPECIFIER_CHAR: atomic_type = ATOMIC_TYPE_CHAR; break; @@ -4015,9 +4070,13 @@ warn_about_long_long: type = allocate_type_zero(TYPE_IMAGINARY); type->imaginary.akind = atomic_type; } else { - type = allocate_type_zero(TYPE_ATOMIC); - type->atomic.akind = atomic_type; + 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"); @@ -4025,15 +4084,19 @@ warn_about_long_long: /* FIXME: check type qualifiers here */ + if (specifiers->modifiers & DM_TRANSPARENT_UNION) + modifiers |= TYPE_MODIFIER_TRANSPARENT_UNION; type->base.qualifiers = qualifiers; type->base.modifiers = modifiers; - type_t *result = typehash_insert(type); - if (newtype && result != type) { - free_type(type); + if (newtype) { + type = identify_new_type(type); + } else { + type = typehash_insert(type); } - specifiers->type = result; + type = handle_type_attributes(specifiers->gnu_attributes, type); + specifiers->type = type; return; end_error: @@ -4077,7 +4140,8 @@ static void parse_identifier_list(scope_t *scope) /* a K&R parameter has no type, yet */ next_token(); - append_entity(scope, entity); + if (scope != NULL) + append_entity(scope, entity); if (token.type != ',') { break; @@ -4110,7 +4174,7 @@ static void semantic_parameter_incomplete(const entity_t *entity) type_t *type = skip_typeref(entity->declaration.type); if (is_type_incomplete(type)) { errorf(&entity->base.source_position, - "parameter '%Y' has incomplete type %T", entity->base.symbol, + "parameter '%Y' has incomplete type '%T'", entity->base.symbol, entity->declaration.type); } } @@ -4129,7 +4193,8 @@ static void parse_parameters(function_type_t *type, scope_t *scope) !is_typedef_symbol(token.v.symbol)) { token_type_t la1_type = (token_type_t)look_ahead(1)->type; if (la1_type == ',' || la1_type == ')') { - type->kr_style_parameters = true; + type->kr_style_parameters = true; + type->unspecified_parameters = true; parse_identifier_list(scope); goto parameters_finished; } @@ -4202,7 +4267,7 @@ static void parse_parameters(function_type_t *type, scope_t *scope) parameters_finished: rem_anchor_token(')'); - expect(')'); + expect(')', end_error); end_error: restore_anchor_state(',', saved_comma_state); @@ -4306,11 +4371,13 @@ static construct_type_t *parse_array_declarator(void) array->is_variable = true; next_token(); } else if (token.type != ']') { - array->size = parse_assignment_expression(); + expression_t *const size = parse_assignment_expression(); + array->size = size; + mark_vars_read(size, NULL); } rem_anchor_token(']'); - expect(']'); + expect(']', end_error); end_error: return &array->construct_type; @@ -4392,11 +4459,11 @@ static construct_type_t *parse_inner_declarator(parse_declarator_env_t *env, case T__based: next_token(); - expect('('); + expect('(', end_error); add_anchor_token(')'); parse_microsoft_based(&base_spec); rem_anchor_token(')'); - expect(')'); + expect(')', end_error); continue; default: @@ -4438,15 +4505,20 @@ ptr_operator_end: next_token(); break; case '(': - next_token(); - add_anchor_token(')'); - inner_types = parse_inner_declarator(env, may_be_abstract); - if (inner_types != NULL) { - /* All later declarators only modify the return type */ - env = NULL; + /* §6.7.6:2 footnote 126: Empty parentheses in a type name are + * interpreted as ``function with no parameter specification'', rather + * than redundant parentheses around the omitted identifier. */ + if (look_ahead(1)->type != ')') { + next_token(); + add_anchor_token(')'); + inner_types = parse_inner_declarator(env, may_be_abstract); + if (inner_types != NULL) { + /* All later declarators only modify the return type */ + env = NULL; + } + rem_anchor_token(')'); + expect(')', end_error); } - rem_anchor_token(')'); - expect(')'); break; default: if (may_be_abstract) @@ -4524,34 +4596,28 @@ static void parse_declaration_attributes(entity_t *entity) if (type == NULL) return; - /* handle these strange/stupid mode attributes */ gnu_attribute_t *attribute = attributes; for ( ; attribute != NULL; attribute = attribute->next) { - if (attribute->kind != GNU_AK_MODE || attribute->invalid) + if (attribute->invalid) continue; - atomic_type_kind_t akind = attribute->u.akind; - if (!is_type_signed(type)) { - switch (akind) { - case ATOMIC_TYPE_CHAR: akind = ATOMIC_TYPE_UCHAR; break; - case ATOMIC_TYPE_SHORT: akind = ATOMIC_TYPE_USHORT; break; - case ATOMIC_TYPE_INT: akind = ATOMIC_TYPE_UINT; break; - case ATOMIC_TYPE_LONGLONG: akind = ATOMIC_TYPE_ULONGLONG; break; - default: - panic("invalid akind in mode attribute"); - } - } else { - switch (akind) { - case ATOMIC_TYPE_CHAR: akind = ATOMIC_TYPE_SCHAR; break; - case ATOMIC_TYPE_SHORT: akind = ATOMIC_TYPE_SHORT; break; - case ATOMIC_TYPE_INT: akind = ATOMIC_TYPE_INT; break; - case ATOMIC_TYPE_LONGLONG: akind = ATOMIC_TYPE_LONGLONG; break; - default: - panic("invalid akind in mode attribute"); + 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 = make_atomic_type(akind, type->base.qualifiers); } type_modifiers_t type_modifiers = type->base.modifiers; @@ -4559,13 +4625,9 @@ static void parse_declaration_attributes(entity_t *entity) type_modifiers |= TYPE_MODIFIER_TRANSPARENT_UNION; if (type->base.modifiers != type_modifiers) { - type_t *copy = duplicate_type(type); + type_t *copy = duplicate_type(type); copy->base.modifiers = type_modifiers; - - type = typehash_insert(copy); - if (type != copy) { - obstack_free(type_obst, copy); - } + type = identify_new_type(copy); } if (entity->kind == ENTITY_TYPEDEF) { @@ -4593,7 +4655,7 @@ static type_t *construct_declarator_type(construct_type_t *construct_list, type_ function_type->function.return_type = type; type_t *skipped_return_type = skip_typeref(type); - /* §6.7.5.3(1) */ + /* §6.7.5.3:1 */ if (is_type_function(skipped_return_type)) { errorf(HERE, "function returning function is not allowed"); } else if (is_type_array(skipped_return_type)) { @@ -4655,7 +4717,7 @@ static type_t *construct_declarator_type(construct_type_t *construct_list, type_ } type_t *skipped_type = skip_typeref(type); - /* §6.7.5.2(1) */ + /* §6.7.5.2:1 */ if (is_type_incomplete(skipped_type)) { errorf(HERE, "array of incomplete type '%T' is not allowed", type); } else if (is_type_function(skipped_type)) { @@ -4666,14 +4728,12 @@ static type_t *construct_declarator_type(construct_type_t *construct_list, type_ } } - type_t *hashed_type = typehash_insert(type); - if (hashed_type != type) { - /* the function type was constructed earlier freeing it here will - * destroy other types... */ - if (iter->kind != CONSTRUCT_FUNCTION) { - free_type(type); - } - type = hashed_type; + /* The function type was constructed earlier. Freeing it here will + * destroy other types. */ + if (iter->kind == CONSTRUCT_FUNCTION) { + type = typehash_insert(type); + } else { + type = identify_new_type(type); } } @@ -4758,19 +4818,21 @@ static entity_t *parse_declarator(const declaration_specifiers_t *specifiers, if (flags & DECL_CREATE_COMPOUND_MEMBER) { entity = allocate_entity_zero(ENTITY_COMPOUND_MEMBER); - if (specifiers->is_inline && is_type_valid(type)) { - errorf(&env.source_position, - "compound member '%Y' declared 'inline'", env.symbol); - } + if (env.symbol != NULL) { + if (specifiers->is_inline && is_type_valid(type)) { + errorf(&env.source_position, + "compound member '%Y' declared 'inline'", env.symbol); + } - if (specifiers->thread_local || - specifiers->storage_class != STORAGE_CLASS_NONE) { - errorf(&env.source_position, - "compound member '%Y' must have no storage class", - env.symbol); + if (specifiers->thread_local || + specifiers->storage_class != STORAGE_CLASS_NONE) { + errorf(&env.source_position, + "compound member '%Y' must have no storage class", + env.symbol); + } } } else if (flags & DECL_IS_PARAMETER) { - orig_type = semantic_parameter(&env.source_position, type, + orig_type = semantic_parameter(&env.source_position, orig_type, specifiers, env.symbol); entity = allocate_entity_zero(ENTITY_PARAMETER); @@ -4780,52 +4842,56 @@ static entity_t *parse_declarator(const declaration_specifiers_t *specifiers, entity->function.is_inline = specifiers->is_inline; entity->function.parameters = env.parameters; - if (specifiers->thread_local || ( - specifiers->storage_class != STORAGE_CLASS_EXTERN && - specifiers->storage_class != STORAGE_CLASS_NONE && - specifiers->storage_class != STORAGE_CLASS_STATIC) - ) { - errorf(&env.source_position, - "invalid storage class for function '%Y'", env.symbol); + if (env.symbol != NULL) { + if (specifiers->thread_local || ( + specifiers->storage_class != STORAGE_CLASS_EXTERN && + specifiers->storage_class != STORAGE_CLASS_NONE && + specifiers->storage_class != STORAGE_CLASS_STATIC + )) { + errorf(&env.source_position, + "invalid storage class for function '%Y'", env.symbol); + } } } 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; - if (specifiers->alignment != 0) { - /* TODO: add checks here */ - entity->variable.alignment = specifiers->alignment; - } - - if (specifiers->is_inline && is_type_valid(type)) { - errorf(&env.source_position, - "variable '%Y' declared 'inline'", env.symbol); - } entity->variable.thread_local = specifiers->thread_local; - bool invalid_storage_class = false; - if (current_scope == file_scope) { - if (specifiers->storage_class != STORAGE_CLASS_EXTERN && - specifiers->storage_class != STORAGE_CLASS_NONE && - specifiers->storage_class != STORAGE_CLASS_STATIC) { - invalid_storage_class = true; + if (env.symbol != NULL) { + if (specifiers->is_inline && is_type_valid(type)) { + errorf(&env.source_position, + "variable '%Y' declared 'inline'", env.symbol); } - } else { - if (specifiers->thread_local && - specifiers->storage_class == STORAGE_CLASS_NONE) { - invalid_storage_class = true; + + bool invalid_storage_class = false; + if (current_scope == file_scope) { + if (specifiers->storage_class != STORAGE_CLASS_EXTERN && + specifiers->storage_class != STORAGE_CLASS_NONE && + specifiers->storage_class != STORAGE_CLASS_STATIC) { + invalid_storage_class = true; + } + } else { + if (specifiers->thread_local && + specifiers->storage_class == STORAGE_CLASS_NONE) { + invalid_storage_class = true; + } + } + if (invalid_storage_class) { + errorf(&env.source_position, + "invalid storage class for variable '%Y'", env.symbol); } - } - if (invalid_storage_class) { - errorf(&env.source_position, - "invalid storage class for variable '%Y'", env.symbol); } } - entity->base.source_position = env.source_position; - entity->base.symbol = env.symbol; + if (env.symbol != NULL) { + entity->base.symbol = env.symbol; + entity->base.source_position = env.source_position; + } else { + entity->base.source_position = specifiers->source_position; + } entity->base.namespc = NAMESPACE_NORMAL; entity->declaration.type = orig_type; entity->declaration.modifiers = env.modifiers; @@ -5169,7 +5235,7 @@ finish: static void parser_error_multiple_definition(entity_t *entity, const source_position_t *source_position) { - errorf(source_position, "multiple definition of symbol '%Y' (declared %P)", + errorf(source_position, "multiple definition of '%Y' (declared %P)", entity->base.symbol, &entity->base.source_position); } @@ -5230,7 +5296,7 @@ static void parse_init_declarator_rest(entity_t *entity) current_init_decl = NULL; if (entity->kind == ENTITY_VARIABLE) { - /* § 6.7.5 (22) array initializers for arrays with unknown size + /* § 6.7.5:22 array initializers for arrays with unknown size * determine the array type size */ declaration->type = env.type; entity->variable.initializer = initializer; @@ -5338,7 +5404,7 @@ static void parse_declaration_rest(entity_t *ndeclaration, ndeclaration = parse_declarator(specifiers, flags); rem_anchor_token('='); } - expect(';'); + expect(';', end_error); end_error: anonymous_entity = NULL; @@ -5364,7 +5430,7 @@ static entity_t *finished_kr_declaration(entity_t *entity, bool is_definition) } if (is_definition) { - errorf(HERE, "parameter %Y is initialised", entity->base.symbol); + errorf(HERE, "parameter '%Y' is initialised", entity->base.symbol); } return record_entity(entity, false); @@ -5497,12 +5563,9 @@ decl_list_end: new_type->function.parameters = parameters; new_type->function.unspecified_parameters = true; - type = typehash_insert(new_type); - if (type != new_type) { - obstack_free(type_obst, new_type); - } + new_type = identify_new_type(new_type); - entity->declaration.type = type; + entity->declaration.type = new_type; rem_anchor_token('{'); } @@ -5561,9 +5624,10 @@ static void check_labels(void) } } -static void warn_unused_entity(entity_t *entity, entity_t *end) +static void warn_unused_entity(entity_t *entity, entity_t *last) { - for (; entity != NULL; entity = entity->base.next) { + entity_t const *const end = last != NULL ? last->base.next : NULL; + for (; entity != end; entity = entity->base.next) { if (!is_declaration(entity)) continue; @@ -5582,9 +5646,6 @@ static void warn_unused_entity(entity_t *entity, entity_t *end) warningf(&entity->base.source_position, "%s '%Y' is never read", what, entity->base.symbol); } - - if (entity == end) - break; } } @@ -5637,6 +5698,7 @@ static int determine_truth(expression_t const* const cond) } static void check_reachable(statement_t *); +static bool reaches_end; static bool expression_returns(expression_t const *const expr) { @@ -5681,10 +5743,14 @@ static bool expression_returns(expression_t const *const expr) case EXPR_INVALID: return true; - case EXPR_STATEMENT: + case EXPR_STATEMENT: { + bool old_reaches_end = reaches_end; + reaches_end = false; check_reachable(expr->statement.statement); - // TODO check if statement can be left - return true; + bool returns = reaches_end; + reaches_end = old_reaches_end; + return returns; + } case EXPR_CONDITIONAL: // TODO handle constant expression @@ -5770,7 +5836,6 @@ static void check_reachable(statement_t *const stmt) switch (stmt->kind) { case STATEMENT_INVALID: case STATEMENT_EMPTY: - case STATEMENT_LOCAL_LABEL: case STATEMENT_ASM: next = stmt->base.next; break; @@ -5796,6 +5861,8 @@ static void check_reachable(statement_t *const stmt) case STATEMENT_COMPOUND: next = stmt->compound.statements; + if (next == NULL) + next = stmt->base.next; break; case STATEMENT_RETURN: { @@ -6020,6 +6087,9 @@ found_break_parent: } break; } + + default: + panic("invalid statement kind"); } while (next == NULL) { @@ -6027,7 +6097,7 @@ found_break_parent: if (next == NULL) { noreturn_candidate = false; - type_t *const type = current_function->base.type; + type_t *const type = skip_typeref(current_function->base.type); assert(is_type_function(type)); type_t *const ret = skip_typeref(type->function.return_type); if (warning.return_type && @@ -6044,7 +6114,6 @@ found_break_parent: case STATEMENT_INVALID: case STATEMENT_EMPTY: case STATEMENT_DECLARATION: - case STATEMENT_LOCAL_LABEL: case STATEMENT_EXPRESSION: case STATEMENT_ASM: case STATEMENT_RETURN: @@ -6055,6 +6124,11 @@ found_break_parent: panic("invalid control flow in function"); case STATEMENT_COMPOUND: + if (next->compound.stmt_expr) { + reaches_end = true; + return; + } + /* FALLTHROUGH */ case STATEMENT_IF: case STATEMENT_SWITCH: case STATEMENT_LABEL: @@ -6206,13 +6280,15 @@ static void check_unreachable(statement_t* const stmt, void *const env) declaration_statement_t const *const decl = &stmt->declaration; entity_t const * ent = decl->declarations_begin; entity_t const *const last = decl->declarations_end; - for (;; ent = ent->base.next) { - if (ent->kind == ENTITY_VARIABLE && - ent->variable.initializer != NULL) { - goto warn_unreachable; + if (ent != NULL) { + for (;; ent = ent->base.next) { + if (ent->kind == ENTITY_VARIABLE && + ent->variable.initializer != NULL) { + goto warn_unreachable; + } + if (ent == last) + return; } - if (ent == last) - return; } } @@ -6274,7 +6350,8 @@ static void parse_external_declaration(void) } assert(is_declaration(ndeclaration)); - type_t *type = skip_typeref(ndeclaration->declaration.type); + type_t *const orig_type = ndeclaration->declaration.type; + type_t * type = skip_typeref(orig_type); if (!is_type_function(type)) { if (is_type_valid(type)) { @@ -6283,6 +6360,11 @@ static void parse_external_declaration(void) } eat_block(); return; + } else if (is_typeref(orig_type)) { + /* §6.9.1:2 */ + errorf(&ndeclaration->base.source_position, + "type of function definition '%#T' is a typedef", + orig_type, ndeclaration->base.symbol); } if (warning.aggregate_return && @@ -6299,18 +6381,15 @@ static void parse_external_declaration(void) ndeclaration->base.symbol); } - /* § 6.7.5.3 (14) a function definition with () means no + /* § 6.7.5.3:14 a function definition with () means no * parameters (and not unspecified parameters) */ - if (type->function.unspecified_parameters - && type->function.parameters == NULL - && !type->function.kr_style_parameters) { - type_t *duplicate = duplicate_type(type); - duplicate->function.unspecified_parameters = false; + if (type->function.unspecified_parameters && + type->function.parameters == NULL && + !type->function.kr_style_parameters) { + type_t *copy = duplicate_type(type); + copy->function.unspecified_parameters = false; + type = identify_new_type(copy); - type = typehash_insert(duplicate); - if (type != duplicate) { - obstack_free(type_obst, duplicate); - } ndeclaration->declaration.type = type; } @@ -6475,53 +6554,58 @@ static void parse_compound_declarators(compound_t *compound, entity->declaration.storage_class = STORAGE_CLASS_NONE; entity->declaration.modifiers = specifiers->modifiers; entity->declaration.type = type; + append_entity(&compound->members, entity); } else { entity = parse_declarator(specifiers, DECL_MAY_BE_ABSTRACT | DECL_CREATE_COMPOUND_MEMBER); - assert(entity->kind == ENTITY_COMPOUND_MEMBER); - - if (token.type == ':') { - source_position_t source_position = *HERE; - next_token(); - expression_t *size = parse_constant_expression(); - - type_t *type = entity->declaration.type; - type_t *bitfield_type = make_bitfield_type(type, size, - &source_position, entity->base.symbol); - entity->declaration.type = bitfield_type; - } - } - - /* make sure we don't define a symbol multiple times */ - symbol_t *symbol = entity->base.symbol; - if (symbol != NULL) { - entity_t *prev = find_compound_entry(compound, symbol); - - if (prev != NULL) { + if (entity->kind == ENTITY_TYPEDEF) { errorf(&entity->base.source_position, - "multiple declarations of symbol '%Y' (declared %P)", - symbol, &prev->base.source_position); - } - } + "typedef not allowed as compound member"); + } else { + assert(entity->kind == ENTITY_COMPOUND_MEMBER); + + /* make sure we don't define a symbol multiple times */ + symbol_t *symbol = entity->base.symbol; + if (symbol != NULL) { + entity_t *prev = find_compound_entry(compound, symbol); + if (prev != NULL) { + errorf(&entity->base.source_position, + "multiple declarations of symbol '%Y' (declared %P)", + symbol, &prev->base.source_position); + } + } - append_entity(&compound->members, entity); + if (token.type == ':') { + source_position_t source_position = *HERE; + next_token(); + expression_t *size = parse_constant_expression(); - type_t *orig_type = entity->declaration.type; - type_t *type = skip_typeref(orig_type); - if (is_type_function(type)) { - errorf(&entity->base.source_position, - "compound member '%Y' must not have function type '%T'", - entity->base.symbol, orig_type); - } else if (is_type_incomplete(type)) { - /* §6.7.2.1:16 flexible array member */ - if (is_type_array(type) && - token.type == ';' && - look_ahead(1)->type == '}') { - compound->has_flexible_member = true; - } else { - errorf(&entity->base.source_position, - "compound member '%Y' has incomplete type '%T'", - entity->base.symbol, orig_type); + type_t *type = entity->declaration.type; + type_t *bitfield_type = make_bitfield_type(type, size, + &source_position, entity->base.symbol); + entity->declaration.type = bitfield_type; + } else { + type_t *orig_type = entity->declaration.type; + type_t *type = skip_typeref(orig_type); + if (is_type_function(type)) { + errorf(&entity->base.source_position, + "compound member '%Y' must not have function type '%T'", + entity->base.symbol, orig_type); + } else if (is_type_incomplete(type)) { + /* §6.7.2.1:16 flexible array member */ + if (is_type_array(type) && + token.type == ';' && + look_ahead(1)->type == '}') { + compound->has_flexible_member = true; + } else { + errorf(&entity->base.source_position, + "compound member '%Y' has incomplete type '%T'", + entity->base.symbol, orig_type); + } + } + } + + append_entity(&compound->members, entity); } } @@ -6529,7 +6613,7 @@ static void parse_compound_declarators(compound_t *compound, break; next_token(); } - expect(';'); + expect(';', end_error); end_error: anonymous_entity = NULL; @@ -6585,7 +6669,7 @@ typedef expression_t* (*parse_expression_infix_function)(expression_t *left); typedef struct expression_parser_function_t expression_parser_function_t; struct expression_parser_function_t { parse_expression_function parser; - unsigned infix_precedence; + precedence_t infix_precedence; parse_expression_infix_function infix_parser; }; @@ -6745,11 +6829,8 @@ static entity_t *create_implicit_function(symbol_t *symbol, type_t *ntype = allocate_type_zero(TYPE_FUNCTION); ntype->function.return_type = type_int; ntype->function.unspecified_parameters = true; - - type_t *type = typehash_insert(ntype); - if (type != ntype) { - free_type(ntype); - } + ntype->function.linkage = LINKAGE_C; + type_t *type = identify_new_type(ntype); entity_t *entity = allocate_entity_zero(ENTITY_FUNCTION); entity->declaration.storage_class = STORAGE_CLASS_EXTERN; @@ -6789,12 +6870,7 @@ static type_t *make_function_2_type(type_t *return_type, type_t *argument_type1, type->function.return_type = return_type; type->function.parameters = parameter1; - type_t *result = typehash_insert(type); - if (result != type) { - free_type(type); - } - - return result; + return identify_new_type(type); } /** @@ -6815,12 +6891,7 @@ static type_t *make_function_1_type(type_t *return_type, type_t *argument_type) type->function.return_type = return_type; type->function.parameters = parameter; - type_t *result = typehash_insert(type); - if (result != type) { - free_type(type); - } - - return result; + return identify_new_type(type); } static type_t *make_function_0_type(type_t *return_type) @@ -6829,12 +6900,7 @@ static type_t *make_function_0_type(type_t *return_type) type->function.return_type = return_type; type->function.parameters = NULL; - type_t *result = typehash_insert(type); - if (result != type) { - free_type(type); - } - - return result; + return identify_new_type(type); } /** @@ -6866,7 +6932,7 @@ static type_t *get_builtin_symbol_type(symbol_t *symbol) case T___builtin_expect: return make_function_2_type(type_long, type_long, type_long); default: - internal_errorf(HERE, "not implemented builtin symbol found"); + internal_errorf(HERE, "not implemented builtin identifier found"); } } @@ -6916,13 +6982,14 @@ type_t *revert_automatic_type_conversion(const expression_t *expression) assert(is_declaration(entity)); type_t *type = entity->declaration.type; return get_qualified_type(type, - expression->base.type->base.qualifiers); + expression->base.type->base.qualifiers); } case EXPR_UNARY_DEREFERENCE: { const expression_t *const value = expression->unary.value; type_t *const type = skip_typeref(value->base.type); - assert(is_type_pointer(type)); + if (!is_type_pointer(type)) + return type_error_type; return type->pointer.points_to; } @@ -6932,9 +6999,8 @@ type_t *revert_automatic_type_conversion(const expression_t *expression) case EXPR_ARRAY_ACCESS: { const expression_t *array_ref = expression->array_access.array_ref; type_t *type_left = skip_typeref(array_ref->base.type); - if (!is_type_valid(type_left)) - return type_left; - assert(is_type_pointer(type_left)); + if (!is_type_pointer(type_left)) + return type_error_type; return type_left->pointer.points_to; } @@ -6951,10 +7017,9 @@ type_t *revert_automatic_type_conversion(const expression_t *expression) case EXPR_COMPOUND_LITERAL: return expression->compound_literal.type; - default: break; + default: + return expression->base.type; } - - return expression->base.type; } static expression_t *parse_reference(void) @@ -6966,14 +7031,15 @@ static expression_t *parse_reference(void) if (entity == NULL) { if (!strict_mode && look_ahead(1)->type == '(') { /* an implicitly declared function */ - if (warning.implicit_function_declaration) { - warningf(HERE, "implicit declaration of function '%Y'", - symbol); + if (warning.error_implicit_function_declaration) { + errorf(HERE, "implicit declaration of function '%Y'", symbol); + } else if (warning.implicit_function_declaration) { + warningf(HERE, "implicit declaration of function '%Y'", symbol); } entity = create_implicit_function(symbol, HERE); } else { - errorf(HERE, "unknown symbol '%Y' found.", symbol); + errorf(HERE, "unknown identifier '%Y' found.", symbol); entity = create_error_entity(symbol, ENTITY_VARIABLE); } } @@ -7130,7 +7196,7 @@ static expression_t *parse_cast(void) type_t *type = parse_typename(); rem_anchor_token(')'); - expect(')'); + expect(')', end_error); if (token.type == '{') { return parse_compound_literal(type); @@ -7162,6 +7228,7 @@ static expression_t *parse_statement_expression(void) expression_t *expression = allocate_expression_zero(EXPR_STATEMENT); statement_t *statement = parse_compound_statement(true); + statement->compound.stmt_expr = true; expression->statement.statement = statement; /* find last statement and use its type */ @@ -7180,7 +7247,7 @@ static expression_t *parse_statement_expression(void) expression->base.type = type; rem_anchor_token(')'); - expect(')'); + expect(')', end_error); end_error: return expression; @@ -7209,8 +7276,9 @@ static expression_t *parse_parenthesized_expression(void) add_anchor_token(')'); expression_t *result = parse_expression(); + result->base.parenthesized = true; rem_anchor_token(')'); - expect(')'); + expect(')', end_error); end_error: return result; @@ -7316,7 +7384,7 @@ static designator_t *parse_designator(void) designator->source_position = *HERE; designator->array_index = parse_expression(); rem_anchor_token(']'); - expect(']'); + expect(']', end_error); if (designator->array_index == NULL) { return NULL; } @@ -7343,15 +7411,15 @@ static expression_t *parse_offsetof(void) eat(T___builtin_offsetof); - expect('('); + expect('(', end_error); add_anchor_token(','); type_t *type = parse_typename(); rem_anchor_token(','); - expect(','); + expect(',', end_error); add_anchor_token(')'); designator_t *designator = parse_designator(); rem_anchor_token(')'); - expect(')'); + expect(')', end_error); expression->offsetofe.type = type; expression->offsetofe.designator = designator; @@ -7383,11 +7451,11 @@ static expression_t *parse_va_start(void) eat(T___builtin_va_start); - expect('('); + expect('(', end_error); add_anchor_token(','); expression->va_starte.ap = parse_assignment_expression(); rem_anchor_token(','); - expect(','); + expect(',', end_error); expression_t *const expr = parse_assignment_expression(); if (expr->kind == EXPR_REFERENCE) { entity_t *const entity = expr->reference.entity; @@ -7399,10 +7467,10 @@ static expression_t *parse_va_start(void) } else { expression->va_starte.parameter = &entity->variable; } - expect(')'); + expect(')', end_error); return expression; } - expect(')'); + expect(')', end_error); end_error: return create_invalid_expression(); } @@ -7416,11 +7484,11 @@ static expression_t *parse_va_arg(void) eat(T___builtin_va_arg); - expect('('); + expect('(', end_error); expression->va_arge.ap = parse_assignment_expression(); - expect(','); + expect(',', end_error); expression->base.type = parse_typename(); - expect(')'); + expect(')', end_error); return expression; end_error: @@ -7452,11 +7520,11 @@ static expression_t *parse_builtin_constant(void) eat(T___builtin_constant_p); - expect('('); + expect('(', end_error); add_anchor_token(')'); expression->builtin_constant.value = parse_assignment_expression(); rem_anchor_token(')'); - expect(')'); + expect(')', end_error); expression->base.type = type_int; return expression; @@ -7473,7 +7541,7 @@ static expression_t *parse_builtin_prefetch(void) eat(T___builtin_prefetch); - expect('('); + expect('(', end_error); add_anchor_token(')'); expression->builtin_prefetch.adr = parse_assignment_expression(); if (token.type == ',') { @@ -7485,7 +7553,7 @@ static expression_t *parse_builtin_prefetch(void) expression->builtin_prefetch.locality = parse_assignment_expression(); } rem_anchor_token(')'); - expect(')'); + expect(')', end_error); expression->base.type = type_void; return expression; @@ -7525,11 +7593,11 @@ static expression_t *parse_compare_builtin(void) expression->base.source_position = *HERE; next_token(); - expect('('); + expect('(', end_error); expression->binary.left = parse_assignment_expression(); - expect(','); + expect(',', end_error); expression->binary.right = parse_assignment_expression(); - expect(')'); + expect(')', end_error); type_t *const orig_type_left = expression->binary.left->base.type; type_t *const orig_type_right = expression->binary.right->base.type; @@ -7552,20 +7620,20 @@ end_error: #if 0 /** - * Parses a __builtin_expect() expression. + * Parses a __builtin_expect(, end_error) expression. */ -static expression_t *parse_builtin_expect(void) +static expression_t *parse_builtin_expect(void, end_error) { expression_t *expression = allocate_expression_zero(EXPR_BINARY_BUILTIN_EXPECT); eat(T___builtin_expect); - expect('('); + expect('(', end_error); expression->binary.left = parse_assignment_expression(); - expect(','); + expect(',', end_error); expression->binary.right = parse_constant_expression(); - expect(')'); + expect(')', end_error); expression->base.type = expression->binary.left->base.type; @@ -7584,11 +7652,11 @@ static expression_t *parse_assume(void) eat(T__assume); - expect('('); + expect('(', end_error); add_anchor_token(')'); expression->unary.value = parse_assignment_expression(); rem_anchor_token(')'); - expect(')'); + expect(')', end_error); expression->base.type = type_void; return expression; @@ -7693,7 +7761,7 @@ static expression_t *parse_noop_expression(void) } rem_anchor_token(','); rem_anchor_token(')'); - expect(')'); + expect(')', end_error); end_error: return cnst; @@ -7811,7 +7879,7 @@ static expression_t *parse_array_expression(expression_t *left) expression->base.type = automatic_type_conversion(return_type); rem_anchor_token(']'); - expect(']'); + expect(']', end_error); end_error: return expression; } @@ -7834,7 +7902,7 @@ static expression_t *parse_typeprop(expression_kind_t const kind) add_anchor_token(')'); orig_type = parse_typename(); rem_anchor_token(')'); - expect(')'); + expect(')', end_error); if (token.type == '{') { /* It was not sizeof(type) after all. It is sizeof of an expression @@ -7855,9 +7923,10 @@ typeprop_expression: tp_expression->typeprop.type = orig_type; type_t const* const type = skip_typeref(orig_type); char const* const wrong_type = - is_type_incomplete(type) ? "incomplete" : - type->kind == TYPE_FUNCTION ? "function designator" : - type->kind == TYPE_BITFIELD ? "bitfield" : + GNU_MODE && is_type_atomic(type, ATOMIC_TYPE_VOID) ? NULL : + is_type_incomplete(type) ? "incomplete" : + type->kind == TYPE_FUNCTION ? "function designator" : + type->kind == TYPE_BITFIELD ? "bitfield" : NULL; if (wrong_type != NULL) { char const* const what = kind == EXPR_SIZEOF ? "sizeof" : "alignof"; @@ -7941,7 +8010,7 @@ static expression_t *parse_select_expression(expression_t *compound) symbol, type_left); } create_error_entry: - return create_invalid_expression(); + entry = create_error_entity(symbol, ENTITY_COMPOUND_MEMBER); } assert(is_declaration(entry)); @@ -8076,7 +8145,7 @@ static expression_t *parse_call_expression(expression_t *expression) } rem_anchor_token(','); rem_anchor_token(')'); - expect(')'); + expect(')', end_error); if (function_type == NULL) return result; @@ -8170,12 +8239,25 @@ static void warn_reference_address_as_bool(expression_t const* expr) } } +static void warn_assignment_in_condition(const expression_t *const expr) +{ + if (!warning.parentheses) + return; + if (expr->base.kind != EXPR_BINARY_ASSIGN) + return; + if (expr->base.parenthesized) + return; + warningf(&expr->base.source_position, + "suggest parentheses around assignment used as truth value"); +} + static void semantic_condition(expression_t const *const expr, char const *const context) { type_t *const type = skip_typeref(expr->base.type); if (is_type_scalar(type)) { warn_reference_address_as_bool(expr); + warn_assignment_in_condition(expr); } else if (is_type_valid(type)) { errorf(&expr->base.source_position, "%s must have scalar type", context); @@ -8208,7 +8290,8 @@ static expression_t *parse_conditional_expression(expression_t *expression) true_expression = parse_expression(); } rem_anchor_token(':'); - expect(':'); + expect(':', end_error); +end_error:; expression_t *false_expression = parse_sub_expression(c_mode & _CXX ? PREC_ASSIGNMENT : PREC_CONDITIONAL); @@ -8317,8 +8400,6 @@ static expression_t *parse_conditional_expression(expression_t *expression) = create_implicit_cast(false_expression, result_type); conditional->base.type = result_type; return result; -end_error: - return create_invalid_expression(); } /** @@ -8345,11 +8426,11 @@ static expression_t *parse_builtin_classify_type(void) eat(T___builtin_classify_type); - expect('('); + expect('(', end_error); add_anchor_token(')'); expression_t *expression = parse_expression(); rem_anchor_token(')'); - expect(')'); + expect(')', end_error); result->classify_type.type_expression = expression; return result; @@ -8371,7 +8452,7 @@ static expression_t *parse_delete(void) if (token.type == '[') { next_token(); result->kind = EXPR_UNARY_DELETE_ARRAY; - expect(']'); + expect(']', end_error); end_error:; } @@ -8380,8 +8461,10 @@ end_error:; type_t *const type = skip_typeref(value->base.type); if (!is_type_pointer(type)) { - errorf(&value->base.source_position, - "operand of delete must have pointer type"); + if (is_type_valid(type)) { + errorf(&value->base.source_position, + "operand of delete must have pointer type"); + } } else if (warning.other && is_type_atomic(skip_typeref(type->pointer.points_to), ATOMIC_TYPE_VOID)) { warningf(&value->base.source_position, @@ -8465,10 +8548,11 @@ static bool check_pointer_arithmetic(const source_position_t *source_position, static bool is_lvalue(const expression_t *expression) { - /* TODO: doesn't seem to be consistent with §6.3.2.1 (1) */ + /* TODO: doesn't seem to be consistent with §6.3.2.1:1 */ switch (expression->kind) { - case EXPR_REFERENCE: case EXPR_ARRAY_ACCESS: + case EXPR_COMPOUND_LITERAL: + case EXPR_REFERENCE: case EXPR_SELECT: case EXPR_UNARY_DEREFERENCE: return true; @@ -8795,6 +8879,22 @@ static void semantic_divmod_arithmetic(binary_expression_t *expression) { warn_div_by_zero(expression); } +static void warn_addsub_in_shift(const expression_t *const expr) +{ + if (expr->base.parenthesized) + return; + + char op; + switch (expr->kind) { + case EXPR_BINARY_ADD: op = '+'; break; + case EXPR_BINARY_SUB: op = '-'; break; + default: return; + } + + warningf(&expr->base.source_position, + "suggest parentheses around '%c' inside shift", op); +} + static void semantic_shift_op(binary_expression_t *expression) { expression_t *const left = expression->left; @@ -8813,6 +8913,11 @@ static void semantic_shift_op(binary_expression_t *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); @@ -8836,7 +8941,6 @@ static void semantic_add(binary_expression_t *expression) expression->left = create_implicit_cast(left, arithmetic_type); expression->right = create_implicit_cast(right, arithmetic_type); expression->base.type = arithmetic_type; - return; } else if (is_type_pointer(type_left) && is_type_integer(type_right)) { check_pointer_arithmetic(&expression->base.source_position, type_left, orig_type_left); @@ -8868,7 +8972,6 @@ static void semantic_sub(binary_expression_t *expression) expression->left = create_implicit_cast(left, arithmetic_type); expression->right = create_implicit_cast(right, arithmetic_type); expression->base.type = arithmetic_type; - return; } else if (is_type_pointer(type_left) && is_type_integer(type_right)) { check_pointer_arithmetic(&expression->base.source_position, type_left, orig_type_left); @@ -8911,6 +9014,32 @@ static void warn_string_literal_address(expression_t const* expr) } } +static void warn_comparison_in_comparison(const expression_t *const expr) +{ + if (expr->base.parenthesized) + return; + switch (expr->base.kind) { + case EXPR_BINARY_LESS: + case EXPR_BINARY_GREATER: + case EXPR_BINARY_LESSEQUAL: + case EXPR_BINARY_GREATEREQUAL: + case EXPR_BINARY_NOTEQUAL: + case EXPR_BINARY_EQUAL: + warningf(&expr->base.source_position, + "comparisons like 'x <= y < z' do not have their mathematical meaning"); + break; + default: + break; + } +} + +static bool maybe_negative(expression_t const *const expr) +{ + return + !is_constant_expression(expr) || + fold_constant(expr) < 0; +} + /** * Check the semantics of comparison expressions. * @@ -8940,6 +9069,11 @@ static void semantic_comparison(binary_expression_t *expression) } } + if (warning.parentheses) { + warn_comparison_in_comparison(left); + warn_comparison_in_comparison(right); + } + type_t *orig_type_left = left->base.type; type_t *orig_type_right = right->base.type; type_t *type_left = skip_typeref(orig_type_left); @@ -8947,37 +9081,23 @@ static void semantic_comparison(binary_expression_t *expression) /* TODO non-arithmetic types */ if (is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) { - /* test for signed vs unsigned compares */ - if (warning.sign_compare && - (expression->base.kind != EXPR_BINARY_EQUAL && - expression->base.kind != EXPR_BINARY_NOTEQUAL) && - (is_type_signed(type_left) != is_type_signed(type_right))) { - - /* check if 1 of the operands is a constant, in this case we just - * check wether we can safely represent the resulting constant in - * the type of the other operand. */ - expression_t *const_expr = NULL; - expression_t *other_expr = NULL; - - if (is_constant_expression(left)) { - const_expr = left; - other_expr = right; - } else if (is_constant_expression(right)) { - const_expr = right; - other_expr = left; - } + type_t *arithmetic_type = semantic_arithmetic(type_left, type_right); - if (const_expr != NULL) { - type_t *other_type = skip_typeref(other_expr->base.type); - long val = fold_constant(const_expr); - /* TODO: check if val can be represented by other_type */ - (void) other_type; - (void) val; + /* test for signed vs unsigned compares */ + if (warning.sign_compare && is_type_integer(arithmetic_type)) { + bool const signed_left = is_type_signed(type_left); + bool const signed_right = is_type_signed(type_right); + if (signed_left != signed_right) { + /* FIXME long long needs better const folding magic */ + /* TODO check whether constant value can be represented by other type */ + if ((signed_left && maybe_negative(left)) || + (signed_right && maybe_negative(right))) { + warningf(&expression->base.source_position, + "comparison between signed and unsigned"); + } } - warningf(&expression->base.source_position, - "comparison between signed and unsigned"); } - type_t *arithmetic_type = semantic_arithmetic(type_left, type_right); + expression->left = create_implicit_cast(left, arithmetic_type); expression->right = create_implicit_cast(right, arithmetic_type); expression->base.type = arithmetic_type; @@ -9130,6 +9250,16 @@ static void semantic_arithmetic_addsubb_assign(binary_expression_t *expression) } } +static void warn_logical_and_within_or(const expression_t *const expr) +{ + if (expr->base.kind != EXPR_BINARY_LOGICAL_AND) + return; + if (expr->base.parenthesized) + return; + warningf(&expr->base.source_position, + "suggest parentheses around && within ||"); +} + /** * Check the semantic restrictions of a logical expression. */ @@ -9139,6 +9269,11 @@ static void semantic_logical_op(binary_expression_t *expression) * §6.5.14:2 Each of the operands shall have scalar type. */ semantic_condition(expression->left, "left operand of logical operator"); semantic_condition(expression->right, "right operand of logical operator"); + if (expression->base.kind == EXPR_BINARY_LOGICAL_OR && + warning.parentheses) { + warn_logical_and_within_or(expression->left); + warn_logical_and_within_or(expression->right); + } expression->base.type = c_mode & _CXX ? type_bool : type_int; } @@ -9432,7 +9567,7 @@ static void register_expression_parser(parse_expression_function parser, * @param precedence the precedence of the operator */ static void register_infix_parser(parse_expression_infix_function parser, - int token_type, unsigned precedence) + int token_type, precedence_t precedence) { expression_parser_function_t *entry = &expression_parsers[token_type]; @@ -9527,11 +9662,11 @@ static asm_argument_t *parse_asm_arguments(bool is_out) } argument->symbol = token.v.symbol; - expect(']'); + expect(']', end_error); } argument->constraints = parse_string_literals(); - expect('('); + expect('(', end_error); add_anchor_token(')'); expression_t *expression = parse_expression(); rem_anchor_token(')'); @@ -9591,7 +9726,7 @@ static asm_argument_t *parse_asm_arguments(bool is_out) mark_vars_read(expression, NULL); } argument->expression = expression; - expect(')'); + expect(')', end_error); set_address_taken(expression, true); @@ -9650,7 +9785,7 @@ static statement_t *parse_asm_statement(void) asm_statement->is_volatile = true; } - expect('('); + expect('(', end_error); add_anchor_token(')'); add_anchor_token(':'); asm_statement->asm_text = parse_string_literals(); @@ -9680,8 +9815,8 @@ static statement_t *parse_asm_statement(void) end_of_asm: rem_anchor_token(')'); - expect(')'); - expect(';'); + expect(')', end_error); + expect(';', end_error); if (asm_statement->outputs == NULL) { /* GCC: An 'asm' instruction without any output operands will be treated @@ -9747,7 +9882,7 @@ static statement_t *parse_case_statement(void) PUSH_PARENT(statement); - expect(':'); + expect(':', end_error); end_error: if (current_switch != NULL) { @@ -9798,7 +9933,7 @@ static statement_t *parse_default_statement(void) PUSH_PARENT(statement); - expect(':'); + expect(':', end_error); if (current_switch != NULL) { const case_label_statement_t *def_label = current_switch->default_label; if (def_label != NULL) { @@ -9906,7 +10041,7 @@ static statement_t *parse_if(void) add_anchor_token('{'); - expect('('); + expect('(', end_error); add_anchor_token(')'); expression_t *const expr = parse_expression(); statement->ifs.condition = expr; @@ -9915,18 +10050,24 @@ static statement_t *parse_if(void) semantic_condition(expr, "condition of 'if'-statment"); mark_vars_read(expr, NULL); rem_anchor_token(')'); - expect(')'); + expect(')', end_error); end_error: rem_anchor_token('{'); add_anchor_token(T_else); - statement->ifs.true_statement = parse_statement(); + statement_t *const true_stmt = parse_statement(); + statement->ifs.true_statement = true_stmt; rem_anchor_token(T_else); if (token.type == T_else) { next_token(); statement->ifs.false_statement = parse_statement(); + } else if (warning.parentheses && + true_stmt->kind == STATEMENT_IF && + true_stmt->ifs.false_statement != NULL) { + warningf(&true_stmt->base.source_position, + "suggest explicit braces to avoid ambiguous 'else'"); } POP_PARENT; @@ -9985,7 +10126,7 @@ static statement_t *parse_switch(void) PUSH_PARENT(statement); - expect('('); + expect('(', end_error); add_anchor_token(')'); expression_t *const expr = parse_expression(); mark_vars_read(expr, NULL); @@ -10005,7 +10146,7 @@ static statement_t *parse_switch(void) type = type_error_type; } statement->switchs.expression = create_implicit_cast(expr, type); - expect(')'); + expect(')', end_error); rem_anchor_token(')'); switch_statement_t *rem = current_switch; @@ -10049,7 +10190,7 @@ static statement_t *parse_while(void) PUSH_PARENT(statement); - expect('('); + expect('(', end_error); add_anchor_token(')'); expression_t *const cond = parse_expression(); statement->whiles.condition = cond; @@ -10058,7 +10199,7 @@ static statement_t *parse_while(void) semantic_condition(cond, "condition of 'while'-statement"); mark_vars_read(cond, NULL); rem_anchor_token(')'); - expect(')'); + expect(')', end_error); statement->whiles.body = parse_loop_body(statement); @@ -10084,8 +10225,8 @@ static statement_t *parse_do(void) statement->do_while.body = parse_loop_body(statement); rem_anchor_token(T_while); - expect(T_while); - expect('('); + expect(T_while, end_error); + expect('(', end_error); add_anchor_token(')'); expression_t *const cond = parse_expression(); statement->do_while.condition = cond; @@ -10094,8 +10235,8 @@ static statement_t *parse_do(void) semantic_condition(cond, "condition of 'do-while'-statement"); mark_vars_read(cond, NULL); rem_anchor_token(')'); - expect(')'); - expect(';'); + expect(')', end_error); + expect(';', end_error); POP_PARENT; return statement; @@ -10113,14 +10254,14 @@ static statement_t *parse_for(void) eat(T_for); + expect('(', end_error1); + add_anchor_token(')'); + PUSH_PARENT(statement); size_t const top = environment_top(); scope_t *old_scope = scope_push(&statement->fors.scope); - expect('('); - add_anchor_token(')'); - if (token.type == ';') { next_token(); } else if (is_declaration_specifier(&token, false)) { @@ -10135,7 +10276,7 @@ static statement_t *parse_for(void) "initialisation of 'for'-statement has no effect"); } rem_anchor_token(';'); - expect(';'); + expect(';', end_error2); } if (token.type != ';') { @@ -10148,7 +10289,7 @@ static statement_t *parse_for(void) mark_vars_read(cond, NULL); rem_anchor_token(';'); } - expect(';'); + expect(';', end_error2); if (token.type != ')') { expression_t *const step = parse_expression(); statement->fors.step = step; @@ -10158,7 +10299,7 @@ static statement_t *parse_for(void) "step of 'for'-statement has no effect"); } } - expect(')'); + expect(')', end_error2); rem_anchor_token(')'); statement->fors.body = parse_loop_body(statement); @@ -10169,13 +10310,15 @@ static statement_t *parse_for(void) POP_PARENT; return statement; -end_error: +end_error2: POP_PARENT; rem_anchor_token(')'); assert(current_scope == &statement->fors.scope); scope_pop(old_scope); environment_pop_to(top); + /* fallthrough */ +end_error1: return create_invalid_statement(); } @@ -10227,7 +10370,7 @@ static statement_t *parse_goto(void) *goto_anchor = &statement->gotos; goto_anchor = &statement->gotos.next; - expect(';'); + expect(';', end_error); return statement; end_error: @@ -10246,7 +10389,7 @@ static statement_t *parse_continue(void) statement_t *statement = allocate_statement_zero(STATEMENT_CONTINUE); eat(T_continue); - expect(';'); + expect(';', end_error); end_error: return statement; @@ -10264,7 +10407,7 @@ static statement_t *parse_break(void) statement_t *statement = allocate_statement_zero(STATEMENT_BREAK); eat(T_break); - expect(';'); + expect(';', end_error); end_error: return statement; @@ -10282,7 +10425,7 @@ static statement_t *parse_leave_statement(void) statement_t *statement = allocate_statement_zero(STATEMENT_LEAVE); eat(T___leave); - expect(';'); + expect(';', end_error); end_error: return statement; @@ -10358,38 +10501,58 @@ static statement_t *parse_return(void) assert(is_type_function(func_type)); type_t *const return_type = skip_typeref(func_type->function.return_type); + source_position_t const *const pos = &statement->base.source_position; if (return_value != NULL) { type_t *return_value_type = skip_typeref(return_value->base.type); - if (is_type_atomic(return_type, ATOMIC_TYPE_VOID) && - !is_type_atomic(return_value_type, ATOMIC_TYPE_VOID)) { - if (warning.other) { - warningf(&statement->base.source_position, - "'return' with a value, in function returning void"); + if (is_type_atomic(return_type, ATOMIC_TYPE_VOID)) { + if (is_type_atomic(return_value_type, ATOMIC_TYPE_VOID)) { + /* ISO/IEC 14882:1998(E) §6.6.3:2 */ + /* Only warn in C mode, because GCC does the same */ + if (c_mode & _CXX || strict_mode) { + errorf(pos, + "'return' with a value, in function returning 'void'"); + } else if (warning.other) { + warningf(pos, + "'return' with a value, in function returning 'void'"); + } + } else if (!(c_mode & _CXX)) { /* ISO/IEC 14882:1998(E) §6.6.3:3 */ + /* Only warn in C mode, because GCC does the same */ + if (strict_mode) { + errorf(pos, + "'return' with expression in function return 'void'"); + } else if (warning.other) { + warningf(pos, + "'return' with expression in function return 'void'"); + } } - return_value = NULL; } else { assign_error_t error = semantic_assign(return_type, return_value); report_assign_error(error, return_type, return_value, "'return'", - &statement->base.source_position); - return_value = create_implicit_cast(return_value, return_type); + pos); } + return_value = create_implicit_cast(return_value, return_type); /* check for returning address of a local var */ if (warning.other && return_value != NULL && return_value->base.kind == EXPR_UNARY_TAKE_ADDRESS) { const expression_t *expression = return_value->unary.value; if (expression_is_local_variable(expression)) { - warningf(&statement->base.source_position, - "function returns address of local variable"); + warningf(pos, "function returns address of local variable"); } } } else if (warning.other && !is_type_atomic(return_type, ATOMIC_TYPE_VOID)) { - warningf(&statement->base.source_position, - "'return' without value, in function returning non-void"); + /* ISO/IEC 14882:1998(E) §6.6.3:3 */ + if (c_mode & _CXX || strict_mode) { + errorf(pos, + "'return' without value, in function returning non-void"); + } else { + warningf(pos, + "'return' without value, in function returning non-void"); + } } statement->returns.value = return_value; - expect(';'); + expect(';', end_error); end_error: return statement; @@ -10430,7 +10593,7 @@ static statement_t *parse_expression_statement(void) statement->expression.expression = expr; mark_vars_read(expr, ENT_ANY); - expect(';'); + expect(';', end_error); end_error: return statement; @@ -10456,7 +10619,7 @@ static statement_t *parse_ms_try_statment(void) if (token.type == T___except) { eat(T___except); - expect('('); + expect('(', end_error); add_anchor_token(')'); expression_t *const expr = parse_expression(); mark_vars_read(expr, NULL); @@ -10470,7 +10633,7 @@ static statement_t *parse_ms_try_statment(void) } statement->ms_try.except_expression = create_implicit_cast(expr, type); rem_anchor_token(')'); - expect(')'); + expect(')', end_error); statement->ms_try.final_statement = parse_compound_statement(false); } else if (token.type == T__finally) { eat(T___finally); @@ -10581,9 +10744,9 @@ static void parse_namespace_definition(void) size_t const top = environment_top(); scope_t *old_scope = scope_push(&entity->namespacee.members); - expect('{'); + expect('{', end_error); parse_externals(); - expect('}'); + expect('}', end_error); end_error: assert(current_scope == &entity->namespacee.members); @@ -10723,6 +10886,94 @@ static statement_t *parse_compound_statement(bool inside_expression_statement) eat('{'); add_anchor_token('}'); + /* tokens, which can start a statement */ + /* TODO MS, __builtin_FOO */ + add_anchor_token('!'); + add_anchor_token('&'); + add_anchor_token('('); + add_anchor_token('*'); + add_anchor_token('+'); + add_anchor_token('-'); + add_anchor_token('{'); + add_anchor_token('~'); + add_anchor_token(T_CHARACTER_CONSTANT); + add_anchor_token(T_COLONCOLON); + add_anchor_token(T_FLOATINGPOINT); + add_anchor_token(T_IDENTIFIER); + add_anchor_token(T_INTEGER); + add_anchor_token(T_MINUSMINUS); + add_anchor_token(T_PLUSPLUS); + add_anchor_token(T_STRING_LITERAL); + add_anchor_token(T_WIDE_CHARACTER_CONSTANT); + add_anchor_token(T_WIDE_STRING_LITERAL); + add_anchor_token(T__Bool); + add_anchor_token(T__Complex); + add_anchor_token(T__Imaginary); + add_anchor_token(T___FUNCTION__); + add_anchor_token(T___PRETTY_FUNCTION__); + add_anchor_token(T___alignof__); + add_anchor_token(T___attribute__); + add_anchor_token(T___builtin_va_start); + add_anchor_token(T___extension__); + add_anchor_token(T___func__); + add_anchor_token(T___imag__); + add_anchor_token(T___label__); + add_anchor_token(T___real__); + add_anchor_token(T___thread); + add_anchor_token(T_asm); + add_anchor_token(T_auto); + add_anchor_token(T_bool); + add_anchor_token(T_break); + add_anchor_token(T_case); + add_anchor_token(T_char); + add_anchor_token(T_class); + add_anchor_token(T_const); + add_anchor_token(T_const_cast); + add_anchor_token(T_continue); + add_anchor_token(T_default); + add_anchor_token(T_delete); + add_anchor_token(T_double); + add_anchor_token(T_do); + add_anchor_token(T_dynamic_cast); + add_anchor_token(T_enum); + add_anchor_token(T_extern); + add_anchor_token(T_false); + add_anchor_token(T_float); + add_anchor_token(T_for); + add_anchor_token(T_goto); + add_anchor_token(T_if); + add_anchor_token(T_inline); + add_anchor_token(T_int); + add_anchor_token(T_long); + add_anchor_token(T_new); + add_anchor_token(T_operator); + add_anchor_token(T_register); + add_anchor_token(T_reinterpret_cast); + add_anchor_token(T_restrict); + add_anchor_token(T_return); + add_anchor_token(T_short); + add_anchor_token(T_signed); + add_anchor_token(T_sizeof); + add_anchor_token(T_static); + add_anchor_token(T_static_cast); + add_anchor_token(T_struct); + add_anchor_token(T_switch); + add_anchor_token(T_template); + add_anchor_token(T_this); + add_anchor_token(T_throw); + add_anchor_token(T_true); + add_anchor_token(T_try); + add_anchor_token(T_typedef); + add_anchor_token(T_typeid); + add_anchor_token(T_typename); + add_anchor_token(T_typeof); + add_anchor_token(T_union); + add_anchor_token(T_unsigned); + add_anchor_token(T_using); + add_anchor_token(T_void); + add_anchor_token(T_volatile); + add_anchor_token(T_wchar_t); + add_anchor_token(T_while); size_t const top = environment_top(); scope_t *old_scope = scope_push(&statement->compound.scope); @@ -10781,6 +11032,92 @@ static statement_t *parse_compound_statement(bool inside_expression_statement) } end_error: + rem_anchor_token(T_while); + rem_anchor_token(T_wchar_t); + rem_anchor_token(T_volatile); + rem_anchor_token(T_void); + rem_anchor_token(T_using); + rem_anchor_token(T_unsigned); + rem_anchor_token(T_union); + rem_anchor_token(T_typeof); + rem_anchor_token(T_typename); + rem_anchor_token(T_typeid); + rem_anchor_token(T_typedef); + rem_anchor_token(T_try); + rem_anchor_token(T_true); + rem_anchor_token(T_throw); + rem_anchor_token(T_this); + rem_anchor_token(T_template); + rem_anchor_token(T_switch); + rem_anchor_token(T_struct); + rem_anchor_token(T_static_cast); + rem_anchor_token(T_static); + rem_anchor_token(T_sizeof); + rem_anchor_token(T_signed); + rem_anchor_token(T_short); + rem_anchor_token(T_return); + rem_anchor_token(T_restrict); + rem_anchor_token(T_reinterpret_cast); + rem_anchor_token(T_register); + rem_anchor_token(T_operator); + rem_anchor_token(T_new); + rem_anchor_token(T_long); + rem_anchor_token(T_int); + rem_anchor_token(T_inline); + rem_anchor_token(T_if); + rem_anchor_token(T_goto); + rem_anchor_token(T_for); + rem_anchor_token(T_float); + rem_anchor_token(T_false); + rem_anchor_token(T_extern); + rem_anchor_token(T_enum); + rem_anchor_token(T_dynamic_cast); + rem_anchor_token(T_do); + rem_anchor_token(T_double); + rem_anchor_token(T_delete); + rem_anchor_token(T_default); + rem_anchor_token(T_continue); + rem_anchor_token(T_const_cast); + rem_anchor_token(T_const); + rem_anchor_token(T_class); + rem_anchor_token(T_char); + rem_anchor_token(T_case); + rem_anchor_token(T_break); + rem_anchor_token(T_bool); + rem_anchor_token(T_auto); + rem_anchor_token(T_asm); + rem_anchor_token(T___thread); + rem_anchor_token(T___real__); + rem_anchor_token(T___label__); + rem_anchor_token(T___imag__); + rem_anchor_token(T___func__); + rem_anchor_token(T___extension__); + rem_anchor_token(T___builtin_va_start); + rem_anchor_token(T___attribute__); + rem_anchor_token(T___alignof__); + rem_anchor_token(T___PRETTY_FUNCTION__); + rem_anchor_token(T___FUNCTION__); + rem_anchor_token(T__Imaginary); + rem_anchor_token(T__Complex); + rem_anchor_token(T__Bool); + rem_anchor_token(T_WIDE_STRING_LITERAL); + rem_anchor_token(T_WIDE_CHARACTER_CONSTANT); + rem_anchor_token(T_STRING_LITERAL); + rem_anchor_token(T_PLUSPLUS); + rem_anchor_token(T_MINUSMINUS); + rem_anchor_token(T_INTEGER); + rem_anchor_token(T_IDENTIFIER); + rem_anchor_token(T_FLOATINGPOINT); + rem_anchor_token(T_COLONCOLON); + rem_anchor_token(T_CHARACTER_CONSTANT); + rem_anchor_token('~'); + rem_anchor_token('{'); + rem_anchor_token('-'); + rem_anchor_token('+'); + rem_anchor_token('*'); + rem_anchor_token('('); + rem_anchor_token('&'); + rem_anchor_token('!'); rem_anchor_token('}'); assert(current_scope == &statement->compound.scope); scope_pop(old_scope); @@ -10832,14 +11169,14 @@ static void parse_global_asm(void) statement_t *statement = allocate_statement_zero(STATEMENT_ASM); eat(T_asm); - expect('('); + expect('(', end_error); statement->asms.asm_text = parse_string_literals(); statement->base.next = unit->global_asm; unit->global_asm = statement; - expect(')'); - expect(';'); + expect(')', end_error); + expect(';', end_error); end_error:; } @@ -10866,7 +11203,7 @@ static void parse_linkage_specification(void) if (token.type == '{') { next_token(); parse_externals(); - expect('}'); + expect('}', end_error); } else { parse_external(); } @@ -11047,9 +11384,7 @@ static void complete_incomplete_arrays(void) new_type->array.has_implicit_size = true; new_type->array.size = 1; - type_t *const result = typehash_insert(new_type); - if (type != result) - free_type(type); + type_t *const result = identify_new_type(new_type); decl->type = result; } @@ -11078,24 +11413,25 @@ void init_parser(void) 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_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"); + 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));