X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast.c;h=ac8caeb63bb3607af5832a2eb63bed99a1efd457;hb=18a1fc944eceff05ebdc0f6baab33db346cdf0a8;hp=8b4ebf469d43c437f13f0c5488288fac66334d57;hpb=146ae3bddd2caa965163ee179da3461366179442;p=cparser diff --git a/ast.c b/ast.c index 8b4ebf4..ac8caeb 100644 --- a/ast.c +++ b/ast.c @@ -24,19 +24,23 @@ #include "type_t.h" #include "parser.h" #include "lang_features.h" +#include "entity_t.h" #include #include #include #include -#ifdef __INTEL_COMPILER +#if defined(__INTEL_COMPILER) #include +#elif defined(__CYGWIN__) +#include "win32/cygwin_math_ext.h" #else #include #endif #include "adt/error.h" +#include "adt/util.h" struct obstack ast_obstack; @@ -73,9 +77,9 @@ void print_indent(void) static int right_to_left(unsigned precedence) { switch (precedence) { - case 2*PREC_ASSIGNMENT: - case 2*PREC_CONDITIONAL: - case 2*PREC_UNARY: + case PREC_ASSIGNMENT: + case PREC_CONDITIONAL: + case PREC_UNARY: return 1; default: @@ -91,95 +95,94 @@ static int right_to_left(unsigned precedence) static unsigned get_expression_precedence(expression_kind_t kind) { static const unsigned prec[] = { - [EXPR_UNKNOWN] = PREC_PRIMARY, - [EXPR_INVALID] = PREC_PRIMARY, - [EXPR_REFERENCE] = PREC_PRIMARY, - [EXPR_CHARACTER_CONSTANT] = PREC_PRIMARY, - [EXPR_WIDE_CHARACTER_CONSTANT] = PREC_PRIMARY, - [EXPR_CONST] = PREC_PRIMARY, - [EXPR_STRING_LITERAL] = PREC_PRIMARY, - [EXPR_WIDE_STRING_LITERAL] = PREC_PRIMARY, - [EXPR_COMPOUND_LITERAL] = PREC_UNARY, - [EXPR_CALL] = PREC_POSTFIX, - [EXPR_CONDITIONAL] = PREC_CONDITIONAL, - [EXPR_SELECT] = PREC_POSTFIX, - [EXPR_ARRAY_ACCESS] = PREC_POSTFIX, - [EXPR_SIZEOF] = PREC_UNARY, - [EXPR_CLASSIFY_TYPE] = PREC_UNARY, - [EXPR_ALIGNOF] = PREC_UNARY, - - [EXPR_FUNCNAME] = PREC_PRIMARY, - [EXPR_BUILTIN_SYMBOL] = PREC_PRIMARY, - [EXPR_BUILTIN_CONSTANT_P] = PREC_PRIMARY, - [EXPR_BUILTIN_PREFETCH] = PREC_PRIMARY, - [EXPR_OFFSETOF] = PREC_PRIMARY, - [EXPR_VA_START] = PREC_PRIMARY, - [EXPR_VA_ARG] = PREC_PRIMARY, - [EXPR_STATEMENT] = PREC_PRIMARY, - [EXPR_LABEL_ADDRESS] = PREC_PRIMARY, - - [EXPR_UNARY_NEGATE] = PREC_UNARY, - [EXPR_UNARY_PLUS] = PREC_UNARY, - [EXPR_UNARY_BITWISE_NEGATE] = PREC_UNARY, - [EXPR_UNARY_NOT] = PREC_UNARY, - [EXPR_UNARY_DEREFERENCE] = PREC_UNARY, - [EXPR_UNARY_TAKE_ADDRESS] = PREC_UNARY, - [EXPR_UNARY_POSTFIX_INCREMENT] = PREC_UNARY, - [EXPR_UNARY_POSTFIX_DECREMENT] = PREC_UNARY, - [EXPR_UNARY_PREFIX_INCREMENT] = PREC_UNARY, - [EXPR_UNARY_PREFIX_DECREMENT] = PREC_UNARY, - [EXPR_UNARY_CAST] = PREC_UNARY, - [EXPR_UNARY_CAST_IMPLICIT] = PREC_UNARY, - [EXPR_UNARY_ASSUME] = PREC_PRIMARY, - [EXPR_UNARY_DELETE] = PREC_UNARY, - [EXPR_UNARY_DELETE_ARRAY] = PREC_UNARY, - [EXPR_UNARY_THROW] = PREC_ASSIGNMENT, - - [EXPR_BINARY_ADD] = PREC_ADDITIVE, - [EXPR_BINARY_SUB] = PREC_ADDITIVE, - [EXPR_BINARY_MUL] = PREC_MULTIPLICATIVE, - [EXPR_BINARY_DIV] = PREC_MULTIPLICATIVE, - [EXPR_BINARY_MOD] = PREC_MULTIPLICATIVE, - [EXPR_BINARY_EQUAL] = PREC_EQUALITY, - [EXPR_BINARY_NOTEQUAL] = PREC_EQUALITY, - [EXPR_BINARY_LESS] = PREC_RELATIONAL, - [EXPR_BINARY_LESSEQUAL] = PREC_RELATIONAL, - [EXPR_BINARY_GREATER] = PREC_RELATIONAL, - [EXPR_BINARY_GREATEREQUAL] = PREC_RELATIONAL, - [EXPR_BINARY_BITWISE_AND] = PREC_AND, - [EXPR_BINARY_BITWISE_OR] = PREC_OR, - [EXPR_BINARY_BITWISE_XOR] = PREC_XOR, - [EXPR_BINARY_LOGICAL_AND] = PREC_LOGICAL_AND, - [EXPR_BINARY_LOGICAL_OR] = PREC_LOGICAL_OR, - [EXPR_BINARY_SHIFTLEFT] = PREC_SHIFT, - [EXPR_BINARY_SHIFTRIGHT] = PREC_SHIFT, - [EXPR_BINARY_ASSIGN] = PREC_ASSIGNMENT, - [EXPR_BINARY_MUL_ASSIGN] = PREC_ASSIGNMENT, - [EXPR_BINARY_DIV_ASSIGN] = PREC_ASSIGNMENT, - [EXPR_BINARY_MOD_ASSIGN] = PREC_ASSIGNMENT, - [EXPR_BINARY_ADD_ASSIGN] = PREC_ASSIGNMENT, - [EXPR_BINARY_SUB_ASSIGN] = PREC_ASSIGNMENT, - [EXPR_BINARY_SHIFTLEFT_ASSIGN] = PREC_ASSIGNMENT, - [EXPR_BINARY_SHIFTRIGHT_ASSIGN] = PREC_ASSIGNMENT, - [EXPR_BINARY_BITWISE_AND_ASSIGN] = PREC_ASSIGNMENT, - [EXPR_BINARY_BITWISE_XOR_ASSIGN] = PREC_ASSIGNMENT, - [EXPR_BINARY_BITWISE_OR_ASSIGN] = PREC_ASSIGNMENT, - [EXPR_BINARY_COMMA] = PREC_EXPRESSION, - - [EXPR_BINARY_BUILTIN_EXPECT] = PREC_PRIMARY, - [EXPR_BINARY_ISGREATER] = PREC_PRIMARY, - [EXPR_BINARY_ISGREATEREQUAL] = PREC_PRIMARY, - [EXPR_BINARY_ISLESS] = PREC_PRIMARY, - [EXPR_BINARY_ISLESSEQUAL] = PREC_PRIMARY, - [EXPR_BINARY_ISLESSGREATER] = PREC_PRIMARY, - [EXPR_BINARY_ISUNORDERED] = PREC_PRIMARY + [EXPR_UNKNOWN] = PREC_PRIMARY, + [EXPR_INVALID] = PREC_PRIMARY, + [EXPR_REFERENCE] = PREC_PRIMARY, + [EXPR_REFERENCE_ENUM_VALUE] = PREC_PRIMARY, + [EXPR_CHARACTER_CONSTANT] = PREC_PRIMARY, + [EXPR_WIDE_CHARACTER_CONSTANT] = PREC_PRIMARY, + [EXPR_CONST] = PREC_PRIMARY, + [EXPR_STRING_LITERAL] = PREC_PRIMARY, + [EXPR_WIDE_STRING_LITERAL] = PREC_PRIMARY, + [EXPR_COMPOUND_LITERAL] = PREC_UNARY, + [EXPR_CALL] = PREC_POSTFIX, + [EXPR_CONDITIONAL] = PREC_CONDITIONAL, + [EXPR_SELECT] = PREC_POSTFIX, + [EXPR_ARRAY_ACCESS] = PREC_POSTFIX, + [EXPR_SIZEOF] = PREC_UNARY, + [EXPR_CLASSIFY_TYPE] = PREC_UNARY, + [EXPR_ALIGNOF] = PREC_UNARY, + + [EXPR_FUNCNAME] = PREC_PRIMARY, + [EXPR_BUILTIN_SYMBOL] = PREC_PRIMARY, + [EXPR_BUILTIN_CONSTANT_P] = PREC_PRIMARY, + [EXPR_BUILTIN_TYPES_COMPATIBLE_P] = PREC_PRIMARY, + [EXPR_OFFSETOF] = PREC_PRIMARY, + [EXPR_VA_START] = PREC_PRIMARY, + [EXPR_VA_ARG] = PREC_PRIMARY, + [EXPR_STATEMENT] = PREC_PRIMARY, + [EXPR_LABEL_ADDRESS] = PREC_PRIMARY, + + [EXPR_UNARY_NEGATE] = PREC_UNARY, + [EXPR_UNARY_PLUS] = PREC_UNARY, + [EXPR_UNARY_BITWISE_NEGATE] = PREC_UNARY, + [EXPR_UNARY_NOT] = PREC_UNARY, + [EXPR_UNARY_DEREFERENCE] = PREC_UNARY, + [EXPR_UNARY_TAKE_ADDRESS] = PREC_UNARY, + [EXPR_UNARY_POSTFIX_INCREMENT] = PREC_POSTFIX, + [EXPR_UNARY_POSTFIX_DECREMENT] = PREC_POSTFIX, + [EXPR_UNARY_PREFIX_INCREMENT] = PREC_UNARY, + [EXPR_UNARY_PREFIX_DECREMENT] = PREC_UNARY, + [EXPR_UNARY_CAST] = PREC_UNARY, + [EXPR_UNARY_CAST_IMPLICIT] = PREC_UNARY, + [EXPR_UNARY_ASSUME] = PREC_PRIMARY, + [EXPR_UNARY_DELETE] = PREC_UNARY, + [EXPR_UNARY_DELETE_ARRAY] = PREC_UNARY, + [EXPR_UNARY_THROW] = PREC_ASSIGNMENT, + + [EXPR_BINARY_ADD] = PREC_ADDITIVE, + [EXPR_BINARY_SUB] = PREC_ADDITIVE, + [EXPR_BINARY_MUL] = PREC_MULTIPLICATIVE, + [EXPR_BINARY_DIV] = PREC_MULTIPLICATIVE, + [EXPR_BINARY_MOD] = PREC_MULTIPLICATIVE, + [EXPR_BINARY_EQUAL] = PREC_EQUALITY, + [EXPR_BINARY_NOTEQUAL] = PREC_EQUALITY, + [EXPR_BINARY_LESS] = PREC_RELATIONAL, + [EXPR_BINARY_LESSEQUAL] = PREC_RELATIONAL, + [EXPR_BINARY_GREATER] = PREC_RELATIONAL, + [EXPR_BINARY_GREATEREQUAL] = PREC_RELATIONAL, + [EXPR_BINARY_BITWISE_AND] = PREC_AND, + [EXPR_BINARY_BITWISE_OR] = PREC_OR, + [EXPR_BINARY_BITWISE_XOR] = PREC_XOR, + [EXPR_BINARY_LOGICAL_AND] = PREC_LOGICAL_AND, + [EXPR_BINARY_LOGICAL_OR] = PREC_LOGICAL_OR, + [EXPR_BINARY_SHIFTLEFT] = PREC_SHIFT, + [EXPR_BINARY_SHIFTRIGHT] = PREC_SHIFT, + [EXPR_BINARY_ASSIGN] = PREC_ASSIGNMENT, + [EXPR_BINARY_MUL_ASSIGN] = PREC_ASSIGNMENT, + [EXPR_BINARY_DIV_ASSIGN] = PREC_ASSIGNMENT, + [EXPR_BINARY_MOD_ASSIGN] = PREC_ASSIGNMENT, + [EXPR_BINARY_ADD_ASSIGN] = PREC_ASSIGNMENT, + [EXPR_BINARY_SUB_ASSIGN] = PREC_ASSIGNMENT, + [EXPR_BINARY_SHIFTLEFT_ASSIGN] = PREC_ASSIGNMENT, + [EXPR_BINARY_SHIFTRIGHT_ASSIGN] = PREC_ASSIGNMENT, + [EXPR_BINARY_BITWISE_AND_ASSIGN] = PREC_ASSIGNMENT, + [EXPR_BINARY_BITWISE_XOR_ASSIGN] = PREC_ASSIGNMENT, + [EXPR_BINARY_BITWISE_OR_ASSIGN] = PREC_ASSIGNMENT, + [EXPR_BINARY_COMMA] = PREC_EXPRESSION, + + [EXPR_BINARY_ISGREATER] = PREC_PRIMARY, + [EXPR_BINARY_ISGREATEREQUAL] = PREC_PRIMARY, + [EXPR_BINARY_ISLESS] = PREC_PRIMARY, + [EXPR_BINARY_ISLESSEQUAL] = PREC_PRIMARY, + [EXPR_BINARY_ISLESSGREATER] = PREC_PRIMARY, + [EXPR_BINARY_ISUNORDERED] = PREC_PRIMARY }; - assert((unsigned)kind < (sizeof(prec)/sizeof(prec[0]))); + assert((size_t)kind < lengthof(prec)); unsigned res = prec[kind]; assert(res != PREC_BOTTOM); - /* we need the lowest bit for right-to-left precedence */ - return 2 * res; + return res; } /** @@ -189,12 +192,14 @@ static unsigned get_expression_precedence(expression_kind_t kind) */ static void print_const(const const_expression_t *cnst) { - if(cnst->base.type == NULL) + if (cnst->base.type == NULL) return; const type_t *const type = skip_typeref(cnst->base.type); - if (is_type_integer(type)) { + if (is_type_atomic(type, ATOMIC_TYPE_BOOL)) { + fputs(cnst->v.int_value ? "true" : "false", out); + } else if (is_type_integer(type)) { fprintf(out, "%lld", cnst->v.int_value); } else if (is_type_float(type)) { long double const val = cnst->v.float_value; @@ -220,10 +225,9 @@ static void print_const(const const_expression_t *cnst) case ATOMIC_TYPE_FLOAT: suffix = "F"; break; case ATOMIC_TYPE_LONG_DOUBLE: suffix = "L"; break; - default: suffix = NULL; break; + default: return; } - if (suffix != NULL) - fputs(suffix, out); + fputs(suffix, out); } /** @@ -238,10 +242,11 @@ static void print_quoted_string(const string_t *const string, char border, int s fputc(border, out); const char *end = string->begin + string->size - skip; for (const char *c = string->begin; c != end; ++c) { - if (*c == border) { + unsigned char const tc = *c; + if (tc == border) { fputc('\\', out); } - switch(*c) { + switch (tc) { case '\\': fputs("\\\\", out); break; case '\a': fputs("\\a", out); break; case '\b': fputs("\\b", out); break; @@ -255,13 +260,13 @@ static void print_quoted_string(const string_t *const string, char border, int s if (c_mode & _GNUC) { fputs("\\e", out); break; } - /*fallthrough*/ + /* FALLTHROUGH */ default: - if(!isprint(*c)) { - fprintf(out, "\\%03o", (unsigned)*c); - break; + if (tc < 0x80 && !isprint(tc)) { + fprintf(out, "\\%03o", (unsigned)tc); + } else { + fputc(tc, out); } - fputc(*c, out); break; } } @@ -297,14 +302,14 @@ static void print_quoted_wide_string(const wide_string_t *const wstr, if (c_mode & _GNUC) { fputs("\\e", out); break; } - /*fallthrough*/ + /* FALLTHROUGH */ default: { const unsigned tc = *c; if (tc < 0x80U) { - if (!isprint(*c)) { - fprintf(out, "\\%03o", (char)*c); - } else { + if (isprint(*c)) { fputc(*c, out); + } else { + fprintf(out, "\\%03o", tc); } } else if (tc < 0x800) { fputc(0xC0 | (tc >> 6), out); @@ -354,19 +359,16 @@ static void print_string_literal( /** * Prints a predefined symbol. */ -static void print_funcname( - const funcname_expression_t *funcname) +static void print_funcname(const funcname_expression_t *funcname) { const char *s = ""; - switch(funcname->kind) { + switch (funcname->kind) { case FUNCNAME_FUNCTION: s = (c_mode & _C99) ? "__func__" : "__FUNCTION__"; break; case FUNCNAME_PRETTY_FUNCTION: s = "__PRETTY_FUNCTION__"; break; case FUNCNAME_FUNCSIG: s = "__FUNCSIG__"; break; case FUNCNAME_FUNCDNAME: s = "__FUNCDNAME__"; break; } - fputc('"', out); fputs(s, out); - fputc('"', out); } static void print_wide_string_literal( @@ -384,6 +386,11 @@ static void print_compound_literal( print_initializer(expression->initializer); } +static void print_assignment_expression(const expression_t *const expr) +{ + print_expression_prec(expr, PREC_ASSIGNMENT); +} + /** * Prints a call expression. * @@ -396,13 +403,13 @@ static void print_call_expression(const call_expression_t *call) fputc('(', out); call_argument_t *argument = call->arguments; int first = 1; - while(argument != NULL) { - if(!first) { + while (argument != NULL) { + if (!first) { fputs(", ", out); } else { first = 0; } - print_expression_prec(argument->expression, 2 * PREC_ASSIGNMENT); + print_assignment_expression(argument->expression); argument = argument->next; } @@ -419,15 +426,6 @@ static void print_binary_expression(const binary_expression_t *binexpr) unsigned prec = get_expression_precedence(binexpr->base.kind); int r2l = right_to_left(prec); - if(binexpr->base.kind == EXPR_BINARY_BUILTIN_EXPECT) { - fputs("__builtin_expect(", out); - print_expression_prec(binexpr->left, prec); - fputs(", ", out); - print_expression_prec(binexpr->right, prec); - fputc(')', out); - return; - } - print_expression_prec(binexpr->left, prec + r2l); char const* op; switch (binexpr->base.kind) { @@ -465,7 +463,7 @@ static void print_binary_expression(const binary_expression_t *binexpr) default: panic("invalid binexpression found"); } fputs(op, out); - print_expression_prec(binexpr->right, prec - r2l); + print_expression_prec(binexpr->right, prec + 1 - r2l); } /** @@ -476,7 +474,7 @@ static void print_binary_expression(const binary_expression_t *binexpr) static void print_unary_expression(const unary_expression_t *unexpr) { unsigned prec = get_expression_precedence(unexpr->base.kind); - switch(unexpr->base.kind) { + switch (unexpr->base.kind) { case EXPR_UNARY_NEGATE: fputc('-', out); break; case EXPR_UNARY_PLUS: fputc('+', out); break; case EXPR_UNARY_NOT: fputc('!', out); break; @@ -504,7 +502,7 @@ static void print_unary_expression(const unary_expression_t *unexpr) break; case EXPR_UNARY_ASSUME: fputs("__assume(", out); - print_expression_prec(unexpr->value, 2 * PREC_ASSIGNMENT); + print_assignment_expression(unexpr->value); fputc(')', out); return; @@ -529,7 +527,7 @@ static void print_unary_expression(const unary_expression_t *unexpr) */ static void print_reference_expression(const reference_expression_t *ref) { - fputs(ref->declaration->symbol->string, out); + fputs(ref->entity->base.symbol->string, out); } /** @@ -539,7 +537,7 @@ static void print_reference_expression(const reference_expression_t *ref) */ static void print_label_address_expression(const label_address_expression_t *le) { - fprintf(out, "&&%s", le->declaration->symbol->string); + fprintf(out, "&&%s", le->label->base.symbol->string); } /** @@ -550,7 +548,7 @@ static void print_label_address_expression(const label_address_expression_t *le) static void print_array_expression(const array_access_expression_t *expression) { unsigned prec = get_expression_precedence(expression->base.kind); - if(!expression->flipped) { + if (!expression->flipped) { print_expression_prec(expression->array_ref, prec); fputc('[', out); print_expression(expression->index); @@ -576,11 +574,9 @@ static void print_typeprop_expression(const typeprop_expression_t *expression) assert(expression->base.kind == EXPR_ALIGNOF); fputs("__alignof__", out); } - if(expression->tp_expression != NULL) { - /* always print the '()' here, sizeof x is right but unusual */ - fputc('(', out); - print_expression(expression->tp_expression); - fputc(')', out); + if (expression->tp_expression != NULL) { + /* PREC_TOP: always print the '()' here, sizeof x is right but unusual */ + print_expression_prec(expression->tp_expression, PREC_TOP); } else { fputc('(', out); print_type(expression->type); @@ -606,27 +602,22 @@ static void print_builtin_symbol(const builtin_symbol_expression_t *expression) static void print_builtin_constant(const builtin_constant_expression_t *expression) { fputs("__builtin_constant_p(", out); - print_expression_prec(expression->value, 2 * PREC_ASSIGNMENT); + print_assignment_expression(expression->value); fputc(')', out); } /** - * Prints a builtin prefetch expression. + * Prints a builtin types compatible expression. * - * @param expression the builtin prefetch expression + * @param expression the builtin types compatible expression */ -static void print_builtin_prefetch(const builtin_prefetch_expression_t *expression) +static void print_builtin_types_compatible( + const builtin_types_compatible_expression_t *expression) { - fputs("__builtin_prefetch(", out); - print_expression_prec(expression->adr, 2 * PREC_ASSIGNMENT); - if (expression->rw) { - fputc(',', out); - print_expression_prec(expression->rw, 2 * PREC_ASSIGNMENT); - } - if (expression->locality) { - fputc(',', out); - print_expression_prec(expression->locality, 2 * PREC_ASSIGNMENT); - } + fputs("__builtin_types_compatible_p(", out); + print_type(expression->left); + fputs(", ", out); + print_type(expression->right); fputc(')', out); } @@ -637,15 +628,16 @@ static void print_builtin_prefetch(const builtin_prefetch_expression_t *expressi */ static void print_conditional(const conditional_expression_t *expression) { - print_expression_prec(expression->condition, 2 * PREC_LOGICAL_OR); + print_expression_prec(expression->condition, PREC_LOGICAL_OR); fputs(" ? ", out); if (expression->true_expression != NULL) { - print_expression_prec(expression->true_expression, 2 * PREC_EXPRESSION); + print_expression_prec(expression->true_expression, PREC_EXPRESSION); fputs(" : ", out); } else { fputs(": ", out); } - print_expression_prec(expression->false_expression, 2 * PREC_CONDITIONAL); + precedence_t prec = c_mode & _CXX ? PREC_ASSIGNMENT : PREC_CONDITIONAL; + print_expression_prec(expression->false_expression, prec); } /** @@ -656,9 +648,9 @@ static void print_conditional(const conditional_expression_t *expression) static void print_va_start(const va_start_expression_t *const expression) { fputs("__builtin_va_start(", out); - print_expression_prec(expression->ap, 2 * PREC_ASSIGNMENT); + print_assignment_expression(expression->ap); fputs(", ", out); - fputs(expression->parameter->symbol->string, out); + fputs(expression->parameter->base.base.symbol->string, out); fputc(')', out); } @@ -670,7 +662,7 @@ static void print_va_start(const va_start_expression_t *const expression) static void print_va_arg(const va_arg_expression_t *expression) { fputs("__builtin_va_arg(", out); - print_expression_prec(expression->ap, 2 * PREC_ASSIGNMENT); + print_assignment_expression(expression->ap); fputs(", ", out); print_type(expression->base.type); fputc(')', out); @@ -685,12 +677,12 @@ static void print_select(const select_expression_t *expression) { unsigned prec = get_expression_precedence(expression->base.kind); print_expression_prec(expression->compound, prec); - if(is_type_pointer(skip_typeref(expression->compound->base.type))) { + if (is_type_pointer(skip_typeref(expression->compound->base.type))) { fputs("->", out); } else { fputc('.', out); } - fputs(expression->compound_entry->symbol->string, out); + fputs(expression->compound_entry->base.symbol->string, out); } /** @@ -702,7 +694,7 @@ static void print_classify_type_expression( const classify_type_expression_t *const expr) { fputs("__builtin_classify_type(", out); - print_expression_prec(expr->type_expression, 2 * PREC_ASSIGNMENT); + print_assignment_expression(expr->type_expression); fputc(')', out); } @@ -763,12 +755,15 @@ static void print_expression_prec(const expression_t *expression, unsigned top_p if (expression->kind == EXPR_UNARY_CAST_IMPLICIT && !print_implicit_casts) { expression = expression->unary.value; } - unsigned prec = get_expression_precedence(expression->base.kind); - if (print_parenthesis && top_prec != PREC_BOTTOM) - top_prec = PREC_TOP; - if (top_prec > prec) + + bool parenthesized = + expression->base.parenthesized || + (print_parenthesis && top_prec != PREC_BOTTOM) || + top_prec > get_expression_precedence(expression->base.kind); + + if (parenthesized) fputc('(', out); - switch(expression->kind) { + switch (expression->kind) { case EXPR_UNKNOWN: case EXPR_INVALID: fputs("$invalid expression$", out); @@ -801,6 +796,7 @@ static void print_expression_prec(const expression_t *expression, unsigned top_p print_binary_expression(&expression->binary); break; case EXPR_REFERENCE: + case EXPR_REFERENCE_ENUM_VALUE: print_reference_expression(&expression->reference); break; case EXPR_ARRAY_ACCESS: @@ -822,8 +818,8 @@ static void print_expression_prec(const expression_t *expression, unsigned top_p case EXPR_BUILTIN_CONSTANT_P: print_builtin_constant(&expression->builtin_constant); break; - case EXPR_BUILTIN_PREFETCH: - print_builtin_prefetch(&expression->builtin_prefetch); + case EXPR_BUILTIN_TYPES_COMPATIBLE_P: + print_builtin_types_compatible(&expression->builtin_types_compatible); break; case EXPR_CONDITIONAL: print_conditional(&expression->conditional); @@ -849,10 +845,10 @@ static void print_expression_prec(const expression_t *expression, unsigned top_p default: /* TODO */ - fprintf(out, "some expression of type %d", (int) expression->kind); + fprintf(out, "some expression of type %d", (int)expression->kind); break; } - if (top_prec > prec) + if (parenthesized) fputc(')', out); } @@ -878,7 +874,7 @@ static void print_compound_statement(const compound_statement_t *block) } --indent; print_indent(); - fputs("}\n", out); + fputs(block->stmt_expr ? "}" : "}\n", out); } /** @@ -888,10 +884,14 @@ static void print_compound_statement(const compound_statement_t *block) */ static void print_return_statement(const return_statement_t *statement) { - fputs("return ", out); - if(statement->value != NULL) - print_expression(statement->value); - fputs(";\n", out); + expression_t const *const val = statement->value; + if (val != NULL) { + fputs("return ", out); + print_expression(val); + fputs(";\n", out); + } else { + fputs("return;\n", out); + } } /** @@ -917,7 +917,7 @@ static void print_goto_statement(const goto_statement_t *statement) fputc('*', out); print_expression(statement->expression); } else { - fputs(statement->label->symbol->string, out); + fputs(statement->label->base.symbol->string, out); } fputs(";\n", out); } @@ -929,7 +929,7 @@ static void print_goto_statement(const goto_statement_t *statement) */ static void print_label_statement(const label_statement_t *statement) { - fprintf(out, "%s:\n", statement->label->symbol->string); + fprintf(out, "%s:\n", statement->label->base.symbol->string); print_indent(); print_statement(statement->statement); } @@ -946,7 +946,7 @@ static void print_if_statement(const if_statement_t *statement) fputs(") ", out); print_statement(statement->true_statement); - if(statement->false_statement != NULL) { + if (statement->false_statement != NULL) { print_indent(); fputs("else ", out); print_statement(statement->false_statement); @@ -973,7 +973,7 @@ static void print_switch_statement(const switch_statement_t *statement) */ static void print_case_label(const case_label_statement_t *statement) { - if(statement->expression == NULL) { + if (statement->expression == NULL) { fputs("default:\n", out); } else { fputs("case ", out); @@ -985,7 +985,7 @@ static void print_case_label(const case_label_statement_t *statement) fputs(":\n", out); } ++indent; - if(statement->statement != NULL) { + if (statement->statement != NULL) { if (statement->statement->base.kind == STATEMENT_CASE_LABEL) { --indent; } @@ -994,6 +994,28 @@ static void print_case_label(const case_label_statement_t *statement) } } +static void print_typedef(const entity_t *entity) +{ + fputs("typedef ", out); + print_type_ext(entity->typedefe.type, entity->base.symbol, NULL); + fputc(';', out); +} + +/** + * returns true if the entity is a compiler generated one and has no real + * correspondenc in the source file + */ +static bool is_generated_entity(const entity_t *entity) +{ + if (entity->kind == ENTITY_TYPEDEF) + return entity->typedefe.builtin; + + if (is_declaration(entity)) + return entity->declaration.implicit; + + return false; +} + /** * Print a declaration statement. * @@ -1003,38 +1025,27 @@ static void print_declaration_statement( const declaration_statement_t *statement) { bool first = true; - declaration_t *declaration = statement->declarations_begin; - - if (declaration->namespc == NAMESPACE_LOCAL_LABEL) { - fputs("__label__ ", out); - for (; - declaration != statement->declarations_end->next; - declaration = declaration->next) { - if (!first) { - fputs(", ", out); - } else { - first = false; - } - fputs(declaration->symbol->string, out); - } - fputs(";\n", out); - } else { - for (; - declaration != statement->declarations_end->next; - declaration = declaration->next) { - if (declaration->storage_class == STORAGE_CLASS_ENUM_ENTRY) - continue; - if (declaration->implicit) - continue; + entity_t *entity = statement->declarations_begin; + if (entity == NULL) { + fputs("/* empty declaration statement */\n", out); + return; + } - if (!first) { - print_indent(); - } else { - first = false; - } - print_declaration(declaration); - fputc('\n', out); + entity_t *const end = statement->declarations_end->base.next; + for (; entity != end; entity = entity->base.next) { + if (entity->kind == ENTITY_ENUM_VALUE) + continue; + if (is_generated_entity(entity)) + continue; + + if (!first) { + print_indent(); + } else { + first = false; } + + print_entity(entity); + fputc('\n', out); } } @@ -1074,27 +1085,25 @@ static void print_do_while_statement(const do_while_statement_t *statement) static void print_for_statement(const for_statement_t *statement) { fputs("for (", out); - declaration_t *decl = statement->scope.declarations; - while (decl != NULL && decl->implicit) - decl = decl->next; - if (decl != NULL) { - assert(statement->initialisation == NULL); - print_declaration(decl); - if (decl->next != NULL) { - panic("multiple declarations in for statement not supported yet"); - } - fputc(' ', out); + if (statement->initialisation != NULL) { + print_expression(statement->initialisation); + fputc(';', out); } else { - if(statement->initialisation) { - print_expression(statement->initialisation); + entity_t const *entity = statement->scope.entities; + for (; entity != NULL; entity = entity->base.next) { + if (is_generated_entity(entity)) + continue; + /* FIXME display of multiple declarations is wrong */ + print_declaration(entity); } - fputs("; ", out); } - if(statement->condition != NULL) { + if (statement->condition != NULL) { + fputc(' ', out); print_expression(statement->condition); } - fputs("; ", out); - if(statement->step != NULL) { + fputc(';', out); + if (statement->step != NULL) { + fputc(' ', out); print_expression(statement->step); } fputs(") ", out); @@ -1109,11 +1118,11 @@ static void print_for_statement(const for_statement_t *statement) static void print_asm_arguments(asm_argument_t *arguments) { asm_argument_t *argument = arguments; - for( ; argument != NULL; argument = argument->next) { - if(argument != arguments) + for (; argument != NULL; argument = argument->next) { + if (argument != arguments) fputs(", ", out); - if(argument->symbol) { + if (argument->symbol) { fprintf(out, "[%s] ", argument->symbol->string); } print_quoted_string(&argument->constraints, '"', 1); @@ -1131,8 +1140,8 @@ static void print_asm_arguments(asm_argument_t *arguments) static void print_asm_clobbers(asm_clobber_t *clobbers) { asm_clobber_t *clobber = clobbers; - for( ; clobber != NULL; clobber = clobber->next) { - if(clobber != clobbers) + for (; clobber != NULL; clobber = clobber->next) { + if (clobber != clobbers) fputs(", ", out); print_quoted_string(&clobber->clobber, '"', 1); @@ -1147,7 +1156,7 @@ static void print_asm_clobbers(asm_clobber_t *clobbers) static void print_asm_statement(const asm_statement_t *statement) { fputs("asm ", out); - if(statement->is_volatile) { + if (statement->is_volatile) { fputs("volatile ", out); } fputc('(', out); @@ -1184,7 +1193,7 @@ static void print_ms_try_statement(const ms_try_statement_t *statement) fputs("__try ", out); print_statement(statement->try_statement); print_indent(); - if(statement->except_expression != NULL) { + if (statement->except_expression != NULL) { fputs("__except(", out); print_expression(statement->except_expression); fputs(") ", out); @@ -1201,7 +1210,7 @@ static void print_ms_try_statement(const ms_try_statement_t *statement) */ static void print_leave_statement(const leave_statement_t *statement) { - (void) statement; + (void)statement; fputs("__leave;\n", out); } @@ -1280,19 +1289,15 @@ void print_statement(const statement_t *statement) */ static void print_storage_class(storage_class_tag_t storage_class) { - switch(storage_class) { - case STORAGE_CLASS_ENUM_ENTRY: - case STORAGE_CLASS_NONE: - break; - case STORAGE_CLASS_TYPEDEF: fputs("typedef ", out); break; - case STORAGE_CLASS_EXTERN: fputs("extern ", out); break; - case STORAGE_CLASS_STATIC: fputs("static ", out); break; - case STORAGE_CLASS_AUTO: fputs("auto ", out); break; - case STORAGE_CLASS_REGISTER: fputs("register ", out); break; - case STORAGE_CLASS_THREAD: fputs("__thread", out); break; - case STORAGE_CLASS_THREAD_EXTERN: fputs("extern __thread", out); break; - case STORAGE_CLASS_THREAD_STATIC: fputs("static __thread", out); break; + switch (storage_class) { + case STORAGE_CLASS_NONE: return; + case STORAGE_CLASS_TYPEDEF: fputs("typedef ", out); return; + case STORAGE_CLASS_EXTERN: fputs("extern ", out); return; + case STORAGE_CLASS_STATIC: fputs("static ", out); return; + case STORAGE_CLASS_AUTO: fputs("auto ", out); return; + case STORAGE_CLASS_REGISTER: fputs("register ", out); return; } + panic("invalid storage class"); } /** @@ -1302,15 +1307,15 @@ static void print_storage_class(storage_class_tag_t storage_class) */ void print_initializer(const initializer_t *initializer) { - if(initializer == NULL) { + if (initializer == NULL) { fputs("{}", out); return; } - switch(initializer->kind) { + switch (initializer->kind) { case INITIALIZER_VALUE: { const initializer_value_t *value = &initializer->value; - print_expression(value->value); + print_assignment_expression(value->value); return; } case INITIALIZER_LIST: { @@ -1318,11 +1323,11 @@ void print_initializer(const initializer_t *initializer) fputs("{ ", out); const initializer_list_t *list = &initializer->list; - for(size_t i = 0 ; i < list->len; ++i) { + for (size_t i = 0 ; i < list->len; ++i) { const initializer_t *sub_init = list->initializers[i]; print_initializer(list->initializers[i]); - if(i < list->len-1) { - if(sub_init == NULL || sub_init->kind != INITIALIZER_DESIGNATOR) + if (i < list->len-1) { + if (sub_init == NULL || sub_init->kind != INITIALIZER_DESIGNATOR) fputs(", ", out); } } @@ -1347,107 +1352,171 @@ void print_initializer(const initializer_t *initializer) /** * Print microsoft extended declaration modifiers. */ -static void print_ms_modifiers(const declaration_t *declaration) { - if((c_mode & _MS) == 0) +static void print_ms_modifiers(const declaration_t *declaration) +{ + if ((c_mode & _MS) == 0) return; decl_modifiers_t modifiers = declaration->modifiers; + bool ds_shown = false; + const char *next = "("; + + if (declaration->base.kind == ENTITY_VARIABLE) { + variable_t *variable = (variable_t*)declaration; + if (variable->alignment != 0 + || variable->get_property_sym != NULL + || variable->put_property_sym != NULL) { + if (!ds_shown) { + fputs("__declspec", out); + ds_shown = true; + } + + if (variable->alignment != 0) { + fputs(next, out); next = ", "; fprintf(out, "align(%u)", variable->alignment); + } + if (variable->get_property_sym != NULL + || variable->put_property_sym != NULL) { + char *comma = ""; + fputs(next, out); next = ", "; fputs("property(", out); + if (variable->get_property_sym != NULL) { + fprintf(out, "get=%s", variable->get_property_sym->string); + comma = ", "; + } + if (variable->put_property_sym != NULL) + fprintf(out, "%sput=%s", comma, variable->put_property_sym->string); + fputc(')', out); + } + } + } + /* DM_FORCEINLINE handled outside. */ - if ((modifiers & ~DM_FORCEINLINE) != 0 || - declaration->alignment != 0 || - declaration->get_property_sym != NULL || - declaration->put_property_sym != NULL) { - char *next = "("; - - fputs("__declspec", out); - if(modifiers & DM_DLLIMPORT) { + if ((modifiers & ~DM_FORCEINLINE) != 0) { + if (!ds_shown) { + fputs("__declspec", out); + ds_shown = true; + } + if (modifiers & DM_DLLIMPORT) { fputs(next, out); next = ", "; fputs("dllimport", out); } - if(modifiers & DM_DLLEXPORT) { + if (modifiers & DM_DLLEXPORT) { fputs(next, out); next = ", "; fputs("dllexport", out); } - if(modifiers & DM_THREAD) { + if (modifiers & DM_THREAD) { fputs(next, out); next = ", "; fputs("thread", out); } - if(modifiers & DM_NAKED) { + if (modifiers & DM_NAKED) { fputs(next, out); next = ", "; fputs("naked", out); } - if(modifiers & DM_THREAD) { + if (modifiers & DM_THREAD) { fputs(next, out); next = ", "; fputs("thread", out); } - if(modifiers & DM_SELECTANY) { + if (modifiers & DM_SELECTANY) { fputs(next, out); next = ", "; fputs("selectany", out); } - if(modifiers & DM_NOTHROW) { + if (modifiers & DM_NOTHROW) { fputs(next, out); next = ", "; fputs("nothrow", out); } - if(modifiers & DM_NORETURN) { + if (modifiers & DM_NORETURN) { fputs(next, out); next = ", "; fputs("noreturn", out); } - if(modifiers & DM_NOINLINE) { + if (modifiers & DM_NOINLINE) { fputs(next, out); next = ", "; fputs("noinline", out); } if (modifiers & DM_DEPRECATED) { fputs(next, out); next = ", "; fputs("deprecated", out); - if(declaration->deprecated_string != NULL) - fprintf(out, "(\"%s\")", declaration->deprecated_string); + if (declaration->deprecated_string != NULL) + fprintf(out, "(\"%s\")", + declaration->deprecated_string); } - if(declaration->alignment != 0) { - fputs(next, out); next = ", "; fprintf(out, "align(%u)", declaration->alignment); - } - if(modifiers & DM_RESTRICT) { + if (modifiers & DM_RESTRICT) { fputs(next, out); next = ", "; fputs("restrict", out); } - if(modifiers & DM_NOALIAS) { + if (modifiers & DM_NOALIAS) { fputs(next, out); next = ", "; fputs("noalias", out); } - if(declaration->get_property_sym != NULL || declaration->put_property_sym != NULL) { - char *comma = ""; - fputs(next, out); next = ", "; fputs("property(", out); - if(declaration->get_property_sym != NULL) { - fprintf(out, "get=%s", declaration->get_property_sym->string); - comma = ", "; - } - if(declaration->put_property_sym != NULL) - fprintf(out, "%sput=%s", comma, declaration->put_property_sym->string); - fputc(')', out); - } + } + + if (ds_shown) fputs(") ", out); +} + +static void print_scope(const scope_t *scope) +{ + const entity_t *entity = scope->entities; + for ( ; entity != NULL; entity = entity->base.next) { + print_indent(); + print_entity(entity); + fputs("\n", out); + } +} + +static void print_namespace(const namespace_t *namespace) +{ + fputs("namespace ", out); + if (namespace->base.symbol != NULL) { + fputs(namespace->base.symbol->string, out); + fputc(' ', out); } + + fputs("{\n", out); + ++indent; + + print_scope(&namespace->members); + + --indent; + print_indent(); + fputs("}\n", out); } /** - * Print a declaration in the NORMAL namespace. - * - * @param declaration the declaration + * Print a variable or function declaration */ -static void print_normal_declaration(const declaration_t *declaration) -{ - print_storage_class((storage_class_tag_t) declaration->declared_storage_class); - if (declaration->is_inline) { - if (declaration->modifiers & DM_FORCEINLINE) { - fputs("__forceinline ", out); - } else if (declaration->modifiers & DM_MICROSOFT_INLINE) { - fputs("__inline ", out); - } else { - fputs("inline ", out); +void print_declaration(const entity_t *entity) +{ + assert(is_declaration(entity)); + const declaration_t *declaration = &entity->declaration; + + print_storage_class((storage_class_tag_t)declaration->declared_storage_class); + if (entity->kind == ENTITY_FUNCTION) { + function_t *function = (function_t*)declaration; + if (function->is_inline) { + if (declaration->modifiers & DM_FORCEINLINE) { + fputs("__forceinline ", out); + } else if (declaration->modifiers & DM_MICROSOFT_INLINE) { + fputs("__inline ", out); + } else { + fputs("inline ", out); + } } } print_ms_modifiers(declaration); - print_type_ext(declaration->type, declaration->symbol, - &declaration->scope); + switch (entity->kind) { + case ENTITY_FUNCTION: + print_type_ext(entity->declaration.type, entity->base.symbol, + &entity->function.parameters); - if(declaration->type->kind == TYPE_FUNCTION) { - if(declaration->init.statement != NULL) { - fputs("\n", out); - print_indent(); - print_statement(declaration->init.statement); - return; - } - } else if(declaration->init.initializer != NULL) { - fputs(" = ", out); - print_initializer(declaration->init.initializer); + if (entity->function.statement != NULL) { + fputc('\n', out); + print_indent(); + print_statement(entity->function.statement); + return; + } + break; + + case ENTITY_VARIABLE: + if (entity->variable.thread_local) + fputs("__thread ", out); + print_type_ext(declaration->type, declaration->base.symbol, NULL); + if (entity->variable.initializer != NULL) { + fputs(" = ", out); + print_initializer(entity->variable.initializer); + } + break; + + default: + print_type_ext(declaration->type, declaration->base.symbol, NULL); + break; } fputc(';', out); } @@ -1459,7 +1528,7 @@ static void print_normal_declaration(const declaration_t *declaration) */ void print_expression(const expression_t *expression) { - print_expression_prec(expression, 2 * PREC_BOTTOM); + print_expression_prec(expression, PREC_BOTTOM); } /** @@ -1467,44 +1536,59 @@ void print_expression(const expression_t *expression) * * @param declaration the declaration */ -void print_declaration(const declaration_t *declaration) +void print_entity(const entity_t *entity) { - if (declaration->namespc != NAMESPACE_NORMAL && - declaration->symbol == NULL) + if (entity->base.namespc != NAMESPACE_NORMAL && entity->base.symbol == NULL) return; - switch (declaration->namespc) { - case NAMESPACE_NORMAL: - print_normal_declaration(declaration); - break; - case NAMESPACE_STRUCT: + switch ((entity_kind_tag_t)entity->kind) { + case ENTITY_VARIABLE: + case ENTITY_PARAMETER: + case ENTITY_COMPOUND_MEMBER: + case ENTITY_FUNCTION: + print_declaration(entity); + return; + case ENTITY_TYPEDEF: + print_typedef(entity); + return; + case ENTITY_STRUCT: fputs("struct ", out); - fputs(declaration->symbol->string, out); - if (declaration->init.complete) { + fputs(entity->base.symbol->string, out); + if (entity->structe.complete) { fputc(' ', out); - print_compound_definition(declaration); + print_compound_definition(&entity->structe); } fputc(';', out); - break; - case NAMESPACE_UNION: + return; + case ENTITY_UNION: fputs("union ", out); - fputs(declaration->symbol->string, out); - if (declaration->init.complete) { + fputs(entity->base.symbol->string, out); + if (entity->unione.complete) { fputc(' ', out); - print_compound_definition(declaration); + print_compound_definition(&entity->unione); } fputc(';', out); - break; - case NAMESPACE_ENUM: + return; + case ENTITY_ENUM: fputs("enum ", out); - fputs(declaration->symbol->string, out); - if (declaration->init.complete) { - fputc(' ', out); - print_enum_definition(declaration); - } + fputs(entity->base.symbol->string, out); + fputc(' ', out); + print_enum_definition(&entity->enume); fputc(';', out); + return; + case ENTITY_NAMESPACE: + print_namespace(&entity->namespacee); + return; + case ENTITY_LOCAL_LABEL: + fprintf(out, "__label__ %s;", entity->base.symbol->string); + return; + case ENTITY_LABEL: + case ENTITY_ENUM_VALUE: + panic("print_entity used on unexpected entity type"); + case ENTITY_INVALID: break; } + panic("Invalid entity type encountered"); } /** @@ -1516,25 +1600,25 @@ void print_ast(const translation_unit_t *unit) { inc_type_visited(); - declaration_t *declaration = unit->scope.declarations; - for( ; declaration != NULL; declaration = declaration->next) { - if(declaration->storage_class == STORAGE_CLASS_ENUM_ENTRY) + entity_t *entity = unit->scope.entities; + for ( ; entity != NULL; entity = entity->base.next) { + if (entity->kind == ENTITY_ENUM_VALUE) continue; - if(declaration->namespc != NAMESPACE_NORMAL && - declaration->symbol == NULL) + if (entity->base.namespc != NAMESPACE_NORMAL + && entity->base.symbol == NULL) continue; - if (declaration->implicit) + if (is_generated_entity(entity)) continue; print_indent(); - print_declaration(declaration); + print_entity(entity); fputc('\n', out); } } bool is_constant_initializer(const initializer_t *initializer) { - switch(initializer->kind) { + switch (initializer->kind) { case INITIALIZER_STRING: case INITIALIZER_WIDE_STRING: case INITIALIZER_DESIGNATOR: @@ -1544,9 +1628,9 @@ bool is_constant_initializer(const initializer_t *initializer) return is_constant_expression(initializer->value.value); case INITIALIZER_LIST: - for(size_t i = 0; i < initializer->list.len; ++i) { + for (size_t i = 0; i < initializer->list.len; ++i) { initializer_t *sub_initializer = initializer->list.initializers[i]; - if(!is_constant_initializer(sub_initializer)) + if (!is_constant_initializer(sub_initializer)) return false; } return true; @@ -1556,13 +1640,13 @@ bool is_constant_initializer(const initializer_t *initializer) static bool is_object_with_linker_constant_address(const expression_t *expression) { - switch(expression->kind) { + switch (expression->kind) { case EXPR_UNARY_DEREFERENCE: return is_address_constant(expression->unary.value); case EXPR_SELECT: { type_t *base_type = skip_typeref(expression->select.compound->base.type); - if(is_type_pointer(base_type)) { + if (is_type_pointer(base_type)) { /* it's a -> */ return is_address_constant(expression->select.compound); } else { @@ -1575,15 +1659,23 @@ static bool is_object_with_linker_constant_address(const expression_t *expressio && is_address_constant(expression->array_access.array_ref); case EXPR_REFERENCE: { - declaration_t *declaration = expression->reference.declaration; - switch((storage_class_tag_t) declaration->storage_class) { - case STORAGE_CLASS_NONE: - case STORAGE_CLASS_EXTERN: - case STORAGE_CLASS_STATIC: - return true; - default: - return false; + entity_t *entity = expression->reference.entity; + if (is_declaration(entity)) { + switch ((storage_class_tag_t)entity->declaration.storage_class) { + case STORAGE_CLASS_NONE: + case STORAGE_CLASS_EXTERN: + case STORAGE_CLASS_STATIC: + return + entity->kind != ENTITY_VARIABLE || + !entity->variable.thread_local; + + case STORAGE_CLASS_REGISTER: + case STORAGE_CLASS_TYPEDEF: + case STORAGE_CLASS_AUTO: + break; + } } + return false; } default: @@ -1593,7 +1685,7 @@ static bool is_object_with_linker_constant_address(const expression_t *expressio bool is_address_constant(const expression_t *expression) { - switch(expression->kind) { + switch (expression->kind) { case EXPR_UNARY_TAKE_ADDRESS: return is_object_with_linker_constant_address(expression->unary.value); @@ -1601,11 +1693,10 @@ bool is_address_constant(const expression_t *expression) type_t *real_type = revert_automatic_type_conversion(expression->unary.value); /* dereferencing a function is a NOP */ - if(is_type_function(real_type)) { + if (is_type_function(real_type)) { return is_address_constant(expression->unary.value); } - - /* fallthrough */ + /* FALLTHROUGH */ } case EXPR_UNARY_CAST: { @@ -1613,8 +1704,8 @@ bool is_address_constant(const expression_t *expression) if (!is_type_pointer(dest) && ( dest->kind != TYPE_ATOMIC || !(get_atomic_type_flags(dest->atomic.akind) & ATOMIC_TYPE_FLAG_INTEGER) || - (get_atomic_type_size(dest->atomic.akind) < get_atomic_type_size(get_intptr_kind()) - ))) + get_atomic_type_size(dest->atomic.akind) < get_atomic_type_size(get_intptr_kind()) + )) return false; return (is_constant_expression(expression->unary.value) @@ -1626,9 +1717,9 @@ bool is_address_constant(const expression_t *expression) expression_t *left = expression->binary.left; expression_t *right = expression->binary.right; - if(is_type_pointer(skip_typeref(left->base.type))) { + if (is_type_pointer(skip_typeref(left->base.type))) { return is_address_constant(left) && is_constant_expression(right); - } else if(is_type_pointer(skip_typeref(right->base.type))) { + } else if (is_type_pointer(skip_typeref(right->base.type))) { return is_constant_expression(left) && is_address_constant(right); } @@ -1636,11 +1727,14 @@ bool is_address_constant(const expression_t *expression) } case EXPR_REFERENCE: { - declaration_t *declaration = expression->reference.declaration; - type_t *type = skip_typeref(declaration->type); - if(is_type_function(type)) + entity_t *entity = expression->reference.entity; + if (!is_declaration(entity)) + return false; + + type_t *type = skip_typeref(entity->declaration.type); + if (is_type_function(type)) return true; - if(is_type_array(type)) { + if (is_type_array(type)) { return is_object_with_linker_constant_address(expression); } /* Prevent stray errors */ @@ -1701,12 +1795,12 @@ static bool is_constant_pointer(const expression_t *expression) static bool is_object_with_constant_address(const expression_t *expression) { - switch(expression->kind) { + switch (expression->kind) { case EXPR_SELECT: { expression_t *compound = expression->select.compound; type_t *compound_type = compound->base.type; compound_type = skip_typeref(compound_type); - if(is_type_pointer(compound_type)) { + if (is_type_pointer(compound_type)) { return is_constant_pointer(compound); } else { return is_object_with_constant_address(compound); @@ -1744,7 +1838,9 @@ bool is_constant_expression(const expression_t *expression) case EXPR_OFFSETOF: case EXPR_ALIGNOF: case EXPR_BUILTIN_CONSTANT_P: + case EXPR_BUILTIN_TYPES_COMPATIBLE_P: case EXPR_LABEL_ADDRESS: + case EXPR_REFERENCE_ENUM_VALUE: return true; case EXPR_SIZEOF: { @@ -1759,11 +1855,11 @@ bool is_constant_expression(const expression_t *expression) } case EXPR_BUILTIN_SYMBOL: - case EXPR_BUILTIN_PREFETCH: case EXPR_SELECT: case EXPR_VA_START: case EXPR_VA_ARG: case EXPR_STATEMENT: + case EXPR_REFERENCE: case EXPR_UNARY_POSTFIX_INCREMENT: case EXPR_UNARY_POSTFIX_DECREMENT: case EXPR_UNARY_PREFIX_INCREMENT: @@ -1819,11 +1915,8 @@ bool is_constant_expression(const expression_t *expression) case EXPR_BINARY_BITWISE_AND: case EXPR_BINARY_BITWISE_OR: case EXPR_BINARY_BITWISE_XOR: - case EXPR_BINARY_LOGICAL_AND: - case EXPR_BINARY_LOGICAL_OR: case EXPR_BINARY_SHIFTLEFT: case EXPR_BINARY_SHIFTRIGHT: - case EXPR_BINARY_BUILTIN_EXPECT: case EXPR_BINARY_ISGREATER: case EXPR_BINARY_ISGREATEREQUAL: case EXPR_BINARY_ISLESS: @@ -1833,27 +1926,39 @@ bool is_constant_expression(const expression_t *expression) return is_constant_expression(expression->binary.left) && is_constant_expression(expression->binary.right); + case EXPR_BINARY_LOGICAL_AND: { + expression_t const *const left = expression->binary.left; + if (!is_constant_expression(left)) + return false; + if (fold_constant(left) == 0) + return true; + return is_constant_expression(expression->binary.right); + } + + case EXPR_BINARY_LOGICAL_OR: { + expression_t const *const left = expression->binary.left; + if (!is_constant_expression(left)) + return false; + if (fold_constant(left) != 0) + return true; + return is_constant_expression(expression->binary.right); + } + case EXPR_COMPOUND_LITERAL: return is_constant_initializer(expression->compound_literal.initializer); case EXPR_CONDITIONAL: { expression_t *condition = expression->conditional.condition; - if(!is_constant_expression(condition)) + if (!is_constant_expression(condition)) return false; long val = fold_constant(condition); - if(val != 0) - return is_constant_expression(expression->conditional.true_expression); - else + if (val != 0) { + expression_t const *const t = expression->conditional.true_expression; + return t == NULL || is_constant_expression(t); + } else { return is_constant_expression(expression->conditional.false_expression); - } - - case EXPR_REFERENCE: { - declaration_t *declaration = expression->reference.declaration; - if(declaration->storage_class == STORAGE_CLASS_ENUM_ENTRY) - return true; - - return false; + } } case EXPR_INVALID: