Move (void) parameter detection into a separate function, simplify daisy chaining...
[cparser] / parser.c
index 6058419..b5a0136 100644 (file)
--- a/parser.c
+++ b/parser.c
@@ -42,7 +42,7 @@
 #include "adt/array.h"
 
 //#define PRINT_TOKENS
-#define MAX_LOOKAHEAD 2
+#define MAX_LOOKAHEAD 1
 
 typedef struct {
        entity_t           *old_entity;
@@ -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;
@@ -98,14 +98,6 @@ typedef struct parse_initializer_env_t {
        bool        must_be_constant;
 } parse_initializer_env_t;
 
-/**
- * Capture a MS __base extension.
- */
-typedef struct based_spec_t {
-       source_position_t  source_position;
-       variable_t        *base_variable;
-} based_spec_t;
-
 typedef entity_t* (*parsed_declaration_func) (entity_t *declaration, bool is_definition);
 
 /** The current token. */
@@ -113,7 +105,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 +142,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];
@@ -205,6 +198,9 @@ static entity_t *record_entity(entity_t *entity, bool is_definition);
 
 static void semantic_comparison(binary_expression_t *expression);
 
+static void create_gnu_builtins(void);
+static void create_microsoft_intrinsics(void);
+
 #define STORAGE_CLASSES       \
        STORAGE_CLASSES_NO_EXTERN \
        case T_extern:
@@ -287,27 +283,16 @@ static void semantic_comparison(binary_expression_t *expression);
        case T___FUNCTION__:             \
        case T___PRETTY_FUNCTION__:      \
        case T___alignof__:              \
-       case T___builtin_alloca:         \
        case T___builtin_classify_type:  \
        case T___builtin_constant_p:     \
-       case T___builtin_expect:         \
-       case T___builtin_huge_val:       \
-       case T___builtin_inf:            \
-       case T___builtin_inff:           \
-       case T___builtin_infl:           \
        case T___builtin_isgreater:      \
        case T___builtin_isgreaterequal: \
        case T___builtin_isless:         \
        case T___builtin_islessequal:    \
        case T___builtin_islessgreater:  \
        case T___builtin_isunordered:    \
-       case T___builtin_nan:            \
-       case T___builtin_nanf:           \
-       case T___builtin_nanl:           \
        case T___builtin_offsetof:       \
-       case T___builtin_prefetch:       \
        case T___builtin_va_arg:         \
-       case T___builtin_va_end:         \
        case T___builtin_va_start:       \
        case T___func__:                 \
        case T___noop:                   \
@@ -350,7 +335,7 @@ static size_t get_entity_struct_size(entity_kind_t kind)
                [ENTITY_LOCAL_LABEL]     = sizeof(label_t),
                [ENTITY_NAMESPACE]       = sizeof(namespace_t)
        };
-       assert(kind < sizeof(sizes) / sizeof(sizes[0]));
+       assert(kind < lengthof(sizes));
        assert(sizes[kind] != 0);
        return sizes[kind];
 }
@@ -380,7 +365,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),
@@ -396,7 +380,7 @@ static size_t get_statement_struct_size(statement_kind_t kind)
                [STATEMENT_MS_TRY]      = sizeof(ms_try_statement_t),
                [STATEMENT_LEAVE]       = sizeof(leave_statement_t)
        };
-       assert(kind < sizeof(sizes) / sizeof(sizes[0]));
+       assert(kind < lengthof(sizes));
        assert(sizes[kind] != 0);
        return sizes[kind];
 }
@@ -409,33 +393,32 @@ static size_t get_statement_struct_size(statement_kind_t kind)
 static size_t get_expression_struct_size(expression_kind_t kind)
 {
        static const size_t sizes[] = {
-               [EXPR_INVALID]                 = sizeof(expression_base_t),
-               [EXPR_REFERENCE]               = sizeof(reference_expression_t),
-               [EXPR_REFERENCE_ENUM_VALUE]    = sizeof(reference_expression_t),
-               [EXPR_CONST]                   = sizeof(const_expression_t),
-               [EXPR_CHARACTER_CONSTANT]      = sizeof(const_expression_t),
-               [EXPR_WIDE_CHARACTER_CONSTANT] = sizeof(const_expression_t),
-               [EXPR_STRING_LITERAL]          = sizeof(string_literal_expression_t),
-               [EXPR_WIDE_STRING_LITERAL]     = sizeof(wide_string_literal_expression_t),
-               [EXPR_COMPOUND_LITERAL]        = sizeof(compound_literal_expression_t),
-               [EXPR_CALL]                    = sizeof(call_expression_t),
-               [EXPR_UNARY_FIRST]             = sizeof(unary_expression_t),
-               [EXPR_BINARY_FIRST]            = sizeof(binary_expression_t),
-               [EXPR_CONDITIONAL]             = sizeof(conditional_expression_t),
-               [EXPR_SELECT]                  = sizeof(select_expression_t),
-               [EXPR_ARRAY_ACCESS]            = sizeof(array_access_expression_t),
-               [EXPR_SIZEOF]                  = sizeof(typeprop_expression_t),
-               [EXPR_ALIGNOF]                 = sizeof(typeprop_expression_t),
-               [EXPR_CLASSIFY_TYPE]           = sizeof(classify_type_expression_t),
-               [EXPR_FUNCNAME]                = sizeof(funcname_expression_t),
-               [EXPR_BUILTIN_SYMBOL]          = sizeof(builtin_symbol_expression_t),
-               [EXPR_BUILTIN_CONSTANT_P]      = sizeof(builtin_constant_expression_t),
-               [EXPR_BUILTIN_PREFETCH]        = sizeof(builtin_prefetch_expression_t),
-               [EXPR_OFFSETOF]                = sizeof(offsetof_expression_t),
-               [EXPR_VA_START]                = sizeof(va_start_expression_t),
-               [EXPR_VA_ARG]                  = sizeof(va_arg_expression_t),
-               [EXPR_STATEMENT]               = sizeof(statement_expression_t),
-               [EXPR_LABEL_ADDRESS]           = sizeof(label_address_expression_t),
+               [EXPR_INVALID]                    = sizeof(expression_base_t),
+               [EXPR_REFERENCE]                  = sizeof(reference_expression_t),
+               [EXPR_REFERENCE_ENUM_VALUE]       = sizeof(reference_expression_t),
+               [EXPR_CONST]                      = sizeof(const_expression_t),
+               [EXPR_CHARACTER_CONSTANT]         = sizeof(const_expression_t),
+               [EXPR_WIDE_CHARACTER_CONSTANT]    = sizeof(const_expression_t),
+               [EXPR_STRING_LITERAL]             = sizeof(string_literal_expression_t),
+               [EXPR_WIDE_STRING_LITERAL]        = sizeof(wide_string_literal_expression_t),
+               [EXPR_COMPOUND_LITERAL]           = sizeof(compound_literal_expression_t),
+               [EXPR_CALL]                       = sizeof(call_expression_t),
+               [EXPR_UNARY_FIRST]                = sizeof(unary_expression_t),
+               [EXPR_BINARY_FIRST]               = sizeof(binary_expression_t),
+               [EXPR_CONDITIONAL]                = sizeof(conditional_expression_t),
+               [EXPR_SELECT]                     = sizeof(select_expression_t),
+               [EXPR_ARRAY_ACCESS]               = sizeof(array_access_expression_t),
+               [EXPR_SIZEOF]                     = sizeof(typeprop_expression_t),
+               [EXPR_ALIGNOF]                    = sizeof(typeprop_expression_t),
+               [EXPR_CLASSIFY_TYPE]              = sizeof(classify_type_expression_t),
+               [EXPR_FUNCNAME]                   = sizeof(funcname_expression_t),
+               [EXPR_BUILTIN_CONSTANT_P]         = sizeof(builtin_constant_expression_t),
+               [EXPR_BUILTIN_TYPES_COMPATIBLE_P] = sizeof(builtin_types_compatible_expression_t),
+               [EXPR_OFFSETOF]                   = sizeof(offsetof_expression_t),
+               [EXPR_VA_START]                   = sizeof(va_start_expression_t),
+               [EXPR_VA_ARG]                     = sizeof(va_arg_expression_t),
+               [EXPR_STATEMENT]                  = sizeof(statement_expression_t),
+               [EXPR_LABEL_ADDRESS]              = sizeof(label_address_expression_t),
        };
        if (kind >= EXPR_UNARY_FIRST && kind <= EXPR_UNARY_LAST) {
                return sizes[EXPR_UNARY_FIRST];
@@ -443,7 +426,7 @@ static size_t get_expression_struct_size(expression_kind_t kind)
        if (kind >= EXPR_BINARY_FIRST && kind <= EXPR_BINARY_LAST) {
                return sizes[EXPR_BINARY_FIRST];
        }
-       assert(kind < sizeof(sizes) / sizeof(sizes[0]));
+       assert(kind < lengthof(sizes));
        assert(sizes[kind] != 0);
        return sizes[kind];
 }
@@ -526,7 +509,7 @@ static size_t get_type_struct_size(type_kind_t kind)
                [TYPE_TYPEDEF]         = sizeof(typedef_type_t),
                [TYPE_TYPEOF]          = sizeof(typeof_type_t),
        };
-       assert(sizeof(sizes) / sizeof(sizes[0]) == (int) TYPE_TYPEOF + 1);
+       assert(lengthof(sizes) == (int)TYPE_TYPEOF + 1);
        assert(kind <= TYPE_TYPEOF);
        assert(sizes[kind] != 0);
        return sizes[kind];
@@ -548,6 +531,14 @@ static type_t *allocate_type_zero(type_kind_t kind)
        return res;
 }
 
+static function_parameter_t *allocate_parameter(type_t *const type)
+{
+       function_parameter_t *const param = obstack_alloc(type_obst, sizeof(*param));
+       memset(param, 0, sizeof(*param));
+       param->type = type;
+       return param;
+}
+
 /**
  * Returns the size of an initializer node.
  *
@@ -562,7 +553,7 @@ static size_t get_initializer_size(initializer_kind_t kind)
                [INITIALIZER_LIST]        = sizeof(initializer_list_t),
                [INITIALIZER_DESIGNATOR]  = sizeof(initializer_designator_t)
        };
-       assert(kind < sizeof(sizes) / sizeof(*sizes));
+       assert(kind < lengthof(sizes));
        assert(sizes[kind] != 0);
        return sizes[kind];
 }
@@ -579,14 +570,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.
  */
@@ -612,7 +595,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);
@@ -623,10 +606,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];
 }
 
@@ -757,7 +740,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.
@@ -977,13 +960,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);
@@ -1031,21 +1009,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;
 }
 
 /**
@@ -1136,7 +1111,7 @@ static void report_assign_error(assign_error_t error, type_t *orig_type_left,
        }
 }
 
-/** Implements the rules from § 6.5.16.1 */
+/** Implements the rules from §6.5.16.1 */
 static assign_error_t semantic_assign(type_t *orig_type_left,
                                       const expression_t *const right)
 {
@@ -1241,6 +1216,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",
@@ -1326,7 +1302,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;
 }
@@ -1475,35 +1451,13 @@ 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, 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(')');
@@ -1589,7 +1543,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 */
@@ -1739,7 +1693,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) {
@@ -1788,6 +1742,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;
@@ -1797,7 +1752,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;
@@ -1805,7 +1760,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;
@@ -1815,7 +1770,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;
@@ -1823,7 +1778,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;
@@ -1832,29 +1787,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 {
@@ -1862,7 +1817,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 {
@@ -1871,12 +1826,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:
@@ -2173,9 +2128,8 @@ unary:
                case EXPR_CLASSIFY_TYPE:
                case EXPR_ALIGNOF:
                case EXPR_FUNCNAME:
-               case EXPR_BUILTIN_SYMBOL:
                case EXPR_BUILTIN_CONSTANT_P:
-               case EXPR_BUILTIN_PREFETCH:
+               case EXPR_BUILTIN_TYPES_COMPATIBLE_P:
                case EXPR_OFFSETOF:
                case EXPR_STATEMENT: // TODO
                case EXPR_LABEL_ADDRESS:
@@ -2265,7 +2219,7 @@ static initializer_t *initializer_from_expression(type_t *orig_type,
 {
        /* TODO check that expression is a constant expression */
 
-       /* § 6.7.8.14/15 char array may be initialized by string literals */
+       /* §6.7.8.14/15 char array may be initialized by string literals */
        type_t *type           = skip_typeref(orig_type);
        type_t *expr_type_orig = expression->base.type;
        type_t *expr_type      = skip_typeref(expr_type_orig);
@@ -2283,6 +2237,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);
@@ -2290,6 +2245,7 @@ static initializer_t *initializer_from_expression(type_t *orig_type,
                                                return initializer_from_wide_string(array_type,
                                                        &expression->wide_string.value);
                                        }
+                                       break;
                                }
 
                                default:
@@ -2327,7 +2283,7 @@ static bool is_initializer_constant(const expression_t *expression)
 /**
  * Parses an scalar initializer.
  *
- * § 6.7.8.11; eat {} without warning
+ * §6.7.8.11; eat {} without warning
  */
 static initializer_t *parse_scalar_initializer(type_t *type,
                                                bool must_be_constant)
@@ -2783,6 +2739,7 @@ finish_designator:
                } 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,
@@ -2912,9 +2869,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);
@@ -2942,13 +2899,14 @@ static initializer_t *parse_initializer(parse_initializer_env_t *env)
                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;
 
@@ -3028,8 +2986,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);
@@ -3143,7 +3101,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);
@@ -3163,12 +3132,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);
                }
@@ -3225,7 +3191,7 @@ static type_t *parse_typeof(void)
                        type = parse_typename();
                } else {
                        expression = parse_expression();
-                       type       = expression->base.type;
+                       type       = revert_automatic_type_conversion(expression);
                }
                break;
 
@@ -3281,13 +3247,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)
@@ -3371,6 +3331,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);
@@ -3474,33 +3437,28 @@ static entity_t *create_error_entity(symbol_t *symbol, entity_kind_tag_t kind)
                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;
 }
 
-static void parse_microsoft_based(based_spec_t *based_spec)
+static variable_t *parse_microsoft_based(void)
 {
        if (token.type != T_IDENTIFIER) {
                parse_error_expected("while parsing __based", T_IDENTIFIER, NULL);
-               return;
+               return NULL;
        }
        symbol_t *symbol = token.v.symbol;
        entity_t *entity = get_entity(symbol, NAMESPACE_NORMAL);
 
+       variable_t *variable;
        if (entity == NULL || entity->base.kind != ENTITY_VARIABLE) {
                errorf(HERE, "'%Y' is not a variable name.", symbol);
-               entity = create_error_entity(symbol, ENTITY_VARIABLE);
+               variable = &create_error_entity(symbol, ENTITY_VARIABLE)->variable;
        } else {
-               variable_t *variable = &entity->variable;
-
-               if (based_spec->base_variable != NULL) {
-                       errorf(HERE, "__based type qualifier specified more than once");
-               }
-               based_spec->source_position = token.source_position;
-               based_spec->base_variable   = variable;
+               variable = &entity->variable;
 
                type_t *const type = variable->base.type;
-
                if (is_type_valid(type)) {
                        if (! is_type_pointer(skip_typeref(type))) {
                                errorf(HERE, "variable in __based modifier must have pointer type instead of '%T'", type);
@@ -3511,6 +3469,7 @@ static void parse_microsoft_based(based_spec_t *based_spec)
                }
        }
        next_token();
+       return variable;
 }
 
 /**
@@ -3612,6 +3571,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;
@@ -3627,8 +3658,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 */
@@ -3849,6 +3878,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)) {
@@ -4023,9 +4055,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");
@@ -4033,15 +4069,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:
@@ -4124,6 +4164,24 @@ static void semantic_parameter_incomplete(const entity_t *entity)
        }
 }
 
+static bool has_parameters(void)
+{
+       /* func(void) is not a parameter */
+       if (token.type == T_IDENTIFIER) {
+               entity_t const *const entity = get_entity(token.v.symbol, NAMESPACE_NORMAL);
+               if (entity->kind != ENTITY_TYPEDEF)
+                       return true;
+               if (skip_typeref(entity->typedefe.type) != type_void)
+                       return true;
+       } else if (token.type != T_void) {
+               return true;
+       }
+       if (look_ahead(1)->type != ')')
+               return true;
+       next_token();
+       return false;
+}
+
 /**
  * Parses function type parameters (and optionally creates variable_t entities
  * for them in a scope)
@@ -4152,61 +4210,49 @@ static void parse_parameters(function_type_t *type, scope_t *scope)
                goto parameters_finished;
        }
 
-       function_parameter_t *parameter;
-       function_parameter_t *last_parameter = NULL;
+       if (has_parameters()) {
+               function_parameter_t **anchor = &type->parameters;
+               for (;;) {
+                       switch (token.type) {
+                       case T_DOTDOTDOT:
+                               next_token();
+                               type->variadic = true;
+                               goto parameters_finished;
 
-       while (true) {
-               switch (token.type) {
-               case T_DOTDOTDOT:
-                       next_token();
-                       type->variadic = true;
-                       goto parameters_finished;
+                       case T_IDENTIFIER:
+                       case T___extension__:
+                       DECLARATION_START
+                       {
+                               entity_t *entity = parse_parameter();
+                               if (entity->kind == ENTITY_TYPEDEF) {
+                                       errorf(&entity->base.source_position,
+                                                       "typedef not allowed as function parameter");
+                                       break;
+                               }
+                               assert(is_declaration(entity));
 
-               case T_IDENTIFIER:
-               case T___extension__:
-               DECLARATION_START
-               {
-                       entity_t *entity = parse_parameter();
-                       if (entity->kind == ENTITY_TYPEDEF) {
-                               errorf(&entity->base.source_position,
-                                      "typedef not allowed as function parameter");
-                               break;
-                       }
-                       assert(is_declaration(entity));
+                               semantic_parameter_incomplete(entity);
 
-                       /* func(void) is not a parameter */
-                       if (last_parameter == NULL
-                                       && token.type == ')'
-                                       && entity->base.symbol == NULL
-                                       && skip_typeref(entity->declaration.type) == type_void) {
-                               goto parameters_finished;
-                       }
-                       semantic_parameter_incomplete(entity);
+                               function_parameter_t *const parameter =
+                                       allocate_parameter(entity->declaration.type);
 
-                       parameter = obstack_alloc(type_obst, sizeof(parameter[0]));
-                       memset(parameter, 0, sizeof(parameter[0]));
-                       parameter->type = entity->declaration.type;
+                               if (scope != NULL) {
+                                       append_entity(scope, entity);
+                               }
 
-                       if (scope != NULL) {
-                               append_entity(scope, entity);
+                               *anchor = parameter;
+                               anchor  = &parameter->next;
+                               break;
                        }
 
-                       if (last_parameter != NULL) {
-                               last_parameter->next = parameter;
-                       } else {
-                               type->parameters = parameter;
+                       default:
+                               goto parameters_finished;
                        }
-                       last_parameter   = parameter;
-                       break;
-               }
-
-               default:
-                       goto parameters_finished;
-               }
-               if (token.type != ',') {
-                       goto parameters_finished;
+                       if (token.type != ',') {
+                               goto parameters_finished;
+                       }
+                       next_token();
                }
-               next_token();
        }
 
 
@@ -4226,67 +4272,69 @@ typedef enum construct_type_kind_t {
        CONSTRUCT_ARRAY
 } construct_type_kind_t;
 
-typedef struct construct_type_t construct_type_t;
-struct construct_type_t {
+typedef union construct_type_t construct_type_t;
+
+typedef struct construct_type_base_t {
        construct_type_kind_t  kind;
        construct_type_t      *next;
-};
-
-typedef struct parsed_pointer_t parsed_pointer_t;
-struct parsed_pointer_t {
-       construct_type_t  construct_type;
-       type_qualifiers_t type_qualifiers;
-       variable_t        *base_variable;  /**< MS __based extension. */
-};
-
-typedef struct parsed_reference_t parsed_reference_t;
-struct parsed_reference_t {
-       construct_type_t construct_type;
-};
-
-typedef struct construct_function_type_t construct_function_type_t;
-struct construct_function_type_t {
-       construct_type_t  construct_type;
-       type_t           *function_type;
-};
-
-typedef struct parsed_array_t parsed_array_t;
-struct parsed_array_t {
-       construct_type_t  construct_type;
-       type_qualifiers_t type_qualifiers;
-       bool              is_static;
-       bool              is_variable;
-       expression_t     *size;
-};
-
-typedef struct construct_base_type_t construct_base_type_t;
-struct construct_base_type_t {
-       construct_type_t  construct_type;
-       type_t           *type;
+} construct_type_base_t;
+
+typedef struct parsed_pointer_t {
+       construct_type_base_t  base;
+       type_qualifiers_t      type_qualifiers;
+       variable_t             *base_variable;  /**< MS __based extension. */
+} parsed_pointer_t;
+
+typedef struct parsed_reference_t {
+       construct_type_base_t base;
+} parsed_reference_t;
+
+typedef struct construct_function_type_t {
+       construct_type_base_t  base;
+       type_t                *function_type;
+} construct_function_type_t;
+
+typedef struct parsed_array_t {
+       construct_type_base_t  base;
+       type_qualifiers_t      type_qualifiers;
+       bool                   is_static;
+       bool                   is_variable;
+       expression_t          *size;
+} parsed_array_t;
+
+union construct_type_t {
+       construct_type_kind_t     kind;
+       construct_type_base_t     base;
+       parsed_pointer_t          pointer;
+       parsed_reference_t        reference;
+       construct_function_type_t function;
+       parsed_array_t            array;
 };
 
 static construct_type_t *parse_pointer_declarator(variable_t *base_variable)
 {
        eat('*');
 
-       parsed_pointer_t *pointer = obstack_alloc(&temp_obst, sizeof(pointer[0]));
-       memset(pointer, 0, sizeof(pointer[0]));
-       pointer->construct_type.kind = CONSTRUCT_POINTER;
-       pointer->type_qualifiers     = parse_type_qualifiers();
-       pointer->base_variable       = base_variable;
+       construct_type_t *cons    = obstack_alloc(&temp_obst, sizeof(cons->pointer));
+       parsed_pointer_t *pointer = &cons->pointer;
+       memset(pointer, 0, sizeof(*pointer));
+       cons->kind               = CONSTRUCT_POINTER;
+       pointer->type_qualifiers = parse_type_qualifiers();
+       pointer->base_variable   = base_variable;
 
-       return &pointer->construct_type;
+       return cons;
 }
 
 static construct_type_t *parse_reference_declarator(void)
 {
        eat('&');
 
-       parsed_reference_t *reference = obstack_alloc(&temp_obst, sizeof(reference[0]));
-       memset(reference, 0, sizeof(reference[0]));
-       reference->construct_type.kind = CONSTRUCT_REFERENCE;
+       construct_type_t   *cons      = obstack_alloc(&temp_obst, sizeof(cons->reference));
+       parsed_reference_t *reference = &cons->reference;
+       memset(reference, 0, sizeof(*reference));
+       cons->kind = CONSTRUCT_REFERENCE;
 
-       return (construct_type_t*)reference;
+       return cons;
 }
 
 static construct_type_t *parse_array_declarator(void)
@@ -4294,9 +4342,10 @@ static construct_type_t *parse_array_declarator(void)
        eat('[');
        add_anchor_token(']');
 
-       parsed_array_t *array = obstack_alloc(&temp_obst, sizeof(array[0]));
-       memset(array, 0, sizeof(array[0]));
-       array->construct_type.kind = CONSTRUCT_ARRAY;
+       construct_type_t *cons  = obstack_alloc(&temp_obst, sizeof(cons->array));
+       parsed_array_t   *array = &cons->array;
+       memset(array, 0, sizeof(*array));
+       cons->kind = CONSTRUCT_ARRAY;
 
        if (token.type == T_static) {
                array->is_static = true;
@@ -4316,14 +4365,16 @@ 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(']', end_error);
 
 end_error:
-       return &array->construct_type;
+       return cons;
 }
 
 static construct_type_t *parse_function_declarator(scope_t *scope,
@@ -4348,13 +4399,13 @@ static construct_type_t *parse_function_declarator(scope_t *scope,
 
        parse_parameters(ftype, scope);
 
-       construct_function_type_t *construct_function_type =
-               obstack_alloc(&temp_obst, sizeof(construct_function_type[0]));
-       memset(construct_function_type, 0, sizeof(construct_function_type[0]));
-       construct_function_type->construct_type.kind = CONSTRUCT_FUNCTION;
-       construct_function_type->function_type       = type;
+       construct_type_t          *cons     = obstack_alloc(&temp_obst, sizeof(cons->function));
+       construct_function_type_t *function = &cons->function;
+       memset(function, 0, sizeof(*function));
+       cons->kind              = CONSTRUCT_FUNCTION;
+       function->function_type = type;
 
-       return &construct_function_type->construct_type;
+       return cons;
 }
 
 typedef struct parse_declarator_env_t {
@@ -4369,66 +4420,57 @@ static construct_type_t *parse_inner_declarator(parse_declarator_env_t *env,
 {
        /* construct a single linked list of construct_type_t's which describe
         * how to construct the final declarator type */
-       construct_type_t *first      = NULL;
-       construct_type_t *last       = NULL;
-       gnu_attribute_t  *attributes = NULL;
+       construct_type_t  *first      = NULL;
+       construct_type_t **anchor     = &first;
+       gnu_attribute_t   *attributes = NULL;
 
        decl_modifiers_t modifiers = parse_attributes(&attributes);
 
-       /* MS __based extension */
-       based_spec_t base_spec;
-       base_spec.base_variable = NULL;
-
        for (;;) {
                construct_type_t *type;
+               variable_t       *based = NULL; /* MS __based extension */
                switch (token.type) {
                        case '&':
                                if (!(c_mode & _CXX))
                                        errorf(HERE, "references are only available for C++");
-                               if (base_spec.base_variable != NULL && warning.other) {
-                                       warningf(&base_spec.source_position,
-                                                "__based does not precede a pointer operator, ignored");
-                               }
                                type = parse_reference_declarator();
-                               /* consumed */
-                               base_spec.base_variable = NULL;
-                               break;
-
-                       case '*':
-                               type = parse_pointer_declarator(base_spec.base_variable);
-                               /* consumed */
-                               base_spec.base_variable = NULL;
                                break;
 
-                       case T__based:
+                       case T__based: {
+                               source_position_t const pos = *HERE;
                                next_token();
                                expect('(', end_error);
                                add_anchor_token(')');
-                               parse_microsoft_based(&base_spec);
+                               based = parse_microsoft_based();
                                rem_anchor_token(')');
                                expect(')', end_error);
-                               continue;
+                               if (token.type != '*') {
+                                       if (token.type == T__based) {
+                                               errorf(&pos, "__based type modifier specified more than once");
+                                       } else if (warning.other) {
+                                               warningf(&pos,
+                                                               "__based does not precede a pointer declarator, ignored");
+                                       }
+                                       continue;
+                               }
+                               /* FALLTHROUGH */
+                       }
+
+                       case '*':
+                               type = parse_pointer_declarator(based);
+                               break;
 
                        default:
                                goto ptr_operator_end;
                }
 
-               if (last == NULL) {
-                       first = type;
-                       last  = type;
-               } else {
-                       last->next = type;
-                       last       = type;
-               }
+               *anchor = type;
+               anchor  = &type->base.next;
 
                /* TODO: find out if this is correct */
                modifiers |= parse_attributes(&attributes);
        }
 ptr_operator_end:
-       if (base_spec.base_variable != NULL && warning.other) {
-               warningf(&base_spec.source_position,
-                        "__based does not precede a pointer operator, ignored");
-       }
 
        if (env != NULL) {
                modifiers      |= env->modifiers;
@@ -4471,9 +4513,9 @@ ptr_operator_end:
                return NULL;
        }
 
-       construct_type_t *p = last;
+       construct_type_t **const p = anchor;
 
-       while (true) {
+       for (;;) {
                construct_type_t *type;
                switch (token.type) {
                case '(': {
@@ -4491,28 +4533,17 @@ ptr_operator_end:
                        goto declarator_finished;
                }
 
-               /* insert in the middle of the list (behind p) */
-               if (p != NULL) {
-                       type->next = p->next;
-                       p->next    = type;
-               } else {
-                       type->next = first;
-                       first      = type;
-               }
-               if (last == p) {
-                       last = type;
-               }
+               /* insert in the middle of the list (at p) */
+               type->base.next = *p;
+               *p              = type;
+               if (anchor == p)
+                       anchor = &type->base.next;
        }
 
 declarator_finished:
-       /* append inner_types at the end of the list, we don't to set last anymore
+       /* append inner_types at the end of the list, we don't to set anchor anymore
         * as it's not needed anymore */
-       if (last == NULL) {
-               assert(first == NULL);
-               first = inner_types;
-       } else {
-               last->next = inner_types;
-       }
+       *anchor = inner_types;
 
        return first;
 end_error:
@@ -4539,34 +4570,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;
@@ -4574,13 +4599,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) {
@@ -4595,20 +4616,18 @@ static void parse_declaration_attributes(entity_t *entity)
 static type_t *construct_declarator_type(construct_type_t *construct_list, type_t *type)
 {
        construct_type_t *iter = construct_list;
-       for (; iter != NULL; iter = iter->next) {
+       for (; iter != NULL; iter = iter->base.next) {
                switch (iter->kind) {
                case CONSTRUCT_INVALID:
-                       internal_errorf(HERE, "invalid type construction found");
+                       break;
                case CONSTRUCT_FUNCTION: {
-                       construct_function_type_t *construct_function_type
-                               = (construct_function_type_t*) iter;
-
-                       type_t *function_type = construct_function_type->function_type;
+                       construct_function_type_t *function      = &iter->function;
+                       type_t                    *function_type = function->function_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)) {
@@ -4620,16 +4639,18 @@ static type_t *construct_declarator_type(construct_type_t *construct_list, type_
                                }
                        }
 
-                       type = function_type;
-                       break;
+                       /* The function type was constructed earlier.  Freeing it here will
+                        * destroy other types. */
+                       type = typehash_insert(function_type);
+                       continue;
                }
 
                case CONSTRUCT_POINTER: {
                        if (is_type_reference(skip_typeref(type)))
                                errorf(HERE, "cannot declare a pointer to reference");
 
-                       parsed_pointer_t *parsed_pointer = (parsed_pointer_t*) iter;
-                       type = make_based_pointer_type(type, parsed_pointer->type_qualifiers, parsed_pointer->base_variable);
+                       parsed_pointer_t *pointer = &iter->pointer;
+                       type = make_based_pointer_type(type, pointer->type_qualifiers, pointer->base_variable);
                        continue;
                }
 
@@ -4644,19 +4665,19 @@ static type_t *construct_declarator_type(construct_type_t *construct_list, type_
                        if (is_type_reference(skip_typeref(type)))
                                errorf(HERE, "cannot declare an array of references");
 
-                       parsed_array_t *parsed_array  = (parsed_array_t*) iter;
-                       type_t         *array_type    = allocate_type_zero(TYPE_ARRAY);
+                       parsed_array_t *array      = &iter->array;
+                       type_t         *array_type = allocate_type_zero(TYPE_ARRAY);
 
-                       expression_t *size_expression = parsed_array->size;
+                       expression_t *size_expression = array->size;
                        if (size_expression != NULL) {
                                size_expression
                                        = create_implicit_cast(size_expression, type_size_t);
                        }
 
-                       array_type->base.qualifiers       = parsed_array->type_qualifiers;
+                       array_type->base.qualifiers       = array->type_qualifiers;
                        array_type->array.element_type    = type;
-                       array_type->array.is_static       = parsed_array->is_static;
-                       array_type->array.is_variable     = parsed_array->is_variable;
+                       array_type->array.is_static       = array->is_static;
+                       array_type->array.is_variable     = array->is_variable;
                        array_type->array.size_expression = size_expression;
 
                        if (size_expression != NULL) {
@@ -4670,26 +4691,17 @@ 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)) {
                                errorf(HERE, "array of functions is not allowed");
                        }
-                       type = array_type;
-                       break;
-               }
+                       type = identify_new_type(array_type);
+                       continue;
                }
-
-               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;
                }
+               internal_errorf(HERE, "invalid type construction found");
        }
 
        return type;
@@ -4773,16 +4785,18 @@ 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, orig_type,
@@ -4795,52 +4809,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;
@@ -4948,6 +4966,16 @@ static void error_redefined_as_different_kind(const source_position_t *pos,
               get_entity_kind_name(new_kind), &old->base.source_position);
 }
 
+static bool is_error_entity(entity_t *const ent)
+{
+       if (is_declaration(ent)) {
+               return is_type_valid(skip_typeref(ent->declaration.type));
+       } else if (ent->kind == ENTITY_TYPEDEF) {
+               return is_type_valid(skip_typeref(ent->typedefe.type));
+       }
+       return false;
+}
+
 /**
  * record entities for the NAMESPACE_NORMAL, and produce error messages/warnings
  * for various problems that occur for multiple definitions
@@ -4962,7 +4990,7 @@ static entity_t *record_entity(entity_t *entity, const bool is_definition)
        if (symbol == NULL)
                return entity;
 
-       entity_t *previous_entity = get_entity(symbol, namespc);
+       entity_t *const previous_entity = get_entity(symbol, namespc);
        /* pushing the same entity twice will break the stack structure */
        assert(previous_entity != entity);
 
@@ -4992,160 +5020,167 @@ static entity_t *record_entity(entity_t *entity, const bool is_definition)
                         entity->declaration.type, symbol);
        }
 
-       if (previous_entity != NULL &&
-                       previous_entity->base.parent_scope == &current_function->parameters &&
-                       previous_entity->base.parent_scope->depth + 1 == current_scope->depth) {
-               assert(previous_entity->kind == ENTITY_PARAMETER);
-               errorf(pos,
-                      "declaration '%#T' redeclares the parameter '%#T' (declared %P)",
-                                        entity->declaration.type, symbol,
-                                        previous_entity->declaration.type, symbol,
-                                        &previous_entity->base.source_position);
-               goto finish;
-       }
-
-       if (previous_entity != NULL &&
-                       previous_entity->base.parent_scope == current_scope) {
-               if (previous_entity->kind != entity->kind) {
-                       error_redefined_as_different_kind(pos, previous_entity,
-                                                         entity->kind);
-                       goto finish;
-               }
-               if (previous_entity->kind == ENTITY_ENUM_VALUE) {
-                       errorf(pos, "redeclaration of enum entry '%Y' (declared %P)",
-                                  symbol, &previous_entity->base.source_position);
-                       goto finish;
-               }
-               if (previous_entity->kind == ENTITY_TYPEDEF) {
-                       /* TODO: C++ allows this for exactly the same type */
-                       errorf(pos, "redefinition of typedef '%Y' (declared %P)",
-                              symbol, &previous_entity->base.source_position);
+       if (previous_entity != NULL) {
+               if (previous_entity->base.parent_scope == &current_function->parameters &&
+                               previous_entity->base.parent_scope->depth + 1 == current_scope->depth) {
+                       assert(previous_entity->kind == ENTITY_PARAMETER);
+                       errorf(pos,
+                                       "declaration '%#T' redeclares the parameter '%#T' (declared %P)",
+                                       entity->declaration.type, symbol,
+                                       previous_entity->declaration.type, symbol,
+                                       &previous_entity->base.source_position);
                        goto finish;
                }
 
-               /* at this point we should have only VARIABLES or FUNCTIONS */
-               assert(is_declaration(previous_entity) && is_declaration(entity));
+               if (previous_entity->base.parent_scope == current_scope) {
+                       if (previous_entity->kind != entity->kind) {
+                               if (!is_error_entity(previous_entity) && !is_error_entity(entity)) {
+                                       error_redefined_as_different_kind(pos, previous_entity,
+                                                       entity->kind);
+                               }
+                               goto finish;
+                       }
+                       if (previous_entity->kind == ENTITY_ENUM_VALUE) {
+                               errorf(pos, "redeclaration of enum entry '%Y' (declared %P)",
+                                               symbol, &previous_entity->base.source_position);
+                               goto finish;
+                       }
+                       if (previous_entity->kind == ENTITY_TYPEDEF) {
+                               /* TODO: C++ allows this for exactly the same type */
+                               errorf(pos, "redefinition of typedef '%Y' (declared %P)",
+                                               symbol, &previous_entity->base.source_position);
+                               goto finish;
+                       }
+
+                       /* at this point we should have only VARIABLES or FUNCTIONS */
+                       assert(is_declaration(previous_entity) && is_declaration(entity));
 
-               declaration_t *const prev_decl = &previous_entity->declaration;
-               declaration_t *const decl      = &entity->declaration;
+                       declaration_t *const prev_decl = &previous_entity->declaration;
+                       declaration_t *const decl      = &entity->declaration;
 
-               /* can happen for K&R style declarations */
-               if (prev_decl->type       == NULL             &&
-                               previous_entity->kind == ENTITY_PARAMETER &&
-                               entity->kind          == ENTITY_PARAMETER) {
-                       prev_decl->type                   = decl->type;
-                       prev_decl->storage_class          = decl->storage_class;
-                       prev_decl->declared_storage_class = decl->declared_storage_class;
-                       prev_decl->modifiers              = decl->modifiers;
-                       prev_decl->deprecated_string      = decl->deprecated_string;
-                       return previous_entity;
-               }
+                       /* can happen for K&R style declarations */
+                       if (prev_decl->type       == NULL             &&
+                                       previous_entity->kind == ENTITY_PARAMETER &&
+                                       entity->kind          == ENTITY_PARAMETER) {
+                               prev_decl->type                   = decl->type;
+                               prev_decl->storage_class          = decl->storage_class;
+                               prev_decl->declared_storage_class = decl->declared_storage_class;
+                               prev_decl->modifiers              = decl->modifiers;
+                               prev_decl->deprecated_string      = decl->deprecated_string;
+                               return previous_entity;
+                       }
 
-               type_t *const orig_type = decl->type;
-               assert(orig_type != NULL);
-               type_t *const type      = skip_typeref(orig_type);
-               type_t *      prev_type = skip_typeref(prev_decl->type);
+                       type_t *const orig_type = decl->type;
+                       assert(orig_type != NULL);
+                       type_t *const type      = skip_typeref(orig_type);
+                       type_t *const prev_type = skip_typeref(prev_decl->type);
 
-               if (!types_compatible(type, prev_type)) {
-                       errorf(pos,
-                                  "declaration '%#T' is incompatible with '%#T' (declared %P)",
-                                  orig_type, symbol, prev_decl->type, symbol,
-                                  &previous_entity->base.source_position);
-               } else {
-                       unsigned old_storage_class = prev_decl->storage_class;
-                       if (warning.redundant_decls               &&
-                                       is_definition                     &&
-                                       !prev_decl->used                  &&
-                                       !(prev_decl->modifiers & DM_USED) &&
-                                       prev_decl->storage_class == STORAGE_CLASS_STATIC) {
-                               warningf(&previous_entity->base.source_position,
-                                        "unnecessary static forward declaration for '%#T'",
-                                        prev_decl->type, symbol);
-                       }
-
-                       unsigned new_storage_class = decl->storage_class;
-                       if (is_type_incomplete(prev_type)) {
-                               prev_decl->type = type;
-                               prev_type       = type;
-                       }
-
-                       /* pretend no storage class means extern for function
-                        * declarations (except if the previous declaration is neither
-                        * none nor extern) */
-                       if (entity->kind == ENTITY_FUNCTION) {
-                               if (prev_type->function.unspecified_parameters) {
-                                       prev_decl->type = type;
-                                       prev_type       = type;
+                       if (!types_compatible(type, prev_type)) {
+                               errorf(pos,
+                                               "declaration '%#T' is incompatible with '%#T' (declared %P)",
+                                               orig_type, symbol, prev_decl->type, symbol,
+                                               &previous_entity->base.source_position);
+                       } else {
+                               unsigned old_storage_class = prev_decl->storage_class;
+                               if (warning.redundant_decls               &&
+                                               is_definition                     &&
+                                               !prev_decl->used                  &&
+                                               !(prev_decl->modifiers & DM_USED) &&
+                                               prev_decl->storage_class == STORAGE_CLASS_STATIC) {
+                                       warningf(&previous_entity->base.source_position,
+                                                       "unnecessary static forward declaration for '%#T'",
+                                                       prev_decl->type, symbol);
                                }
 
-                               switch (old_storage_class) {
-                               case STORAGE_CLASS_NONE:
-                                       old_storage_class = STORAGE_CLASS_EXTERN;
-                                       /* FALLTHROUGH */
-
-                               case STORAGE_CLASS_EXTERN:
-                                       if (is_definition) {
-                                               if (warning.missing_prototypes &&
-                                                   prev_type->function.unspecified_parameters &&
-                                                   !is_sym_main(symbol)) {
-                                                       warningf(pos, "no previous prototype for '%#T'",
-                                                                        orig_type, symbol);
-                                               }
-                                       } else if (new_storage_class == STORAGE_CLASS_NONE) {
-                                               new_storage_class = STORAGE_CLASS_EXTERN;
-                                       }
-                                       break;
+                               storage_class_t new_storage_class = decl->storage_class;
+
+                               /* pretend no storage class means extern for function
+                                * declarations (except if the previous declaration is neither
+                                * none nor extern) */
+                               if (entity->kind == ENTITY_FUNCTION) {
+                                       /* the previous declaration could have unspecified parameters or
+                                        * be a typedef, so use the new type */
+                                       if (prev_type->function.unspecified_parameters || is_definition)
+                                               prev_decl->type = type;
+
+                                       switch (old_storage_class) {
+                                               case STORAGE_CLASS_NONE:
+                                                       old_storage_class = STORAGE_CLASS_EXTERN;
+                                                       /* FALLTHROUGH */
+
+                                               case STORAGE_CLASS_EXTERN:
+                                                       if (is_definition) {
+                                                               if (warning.missing_prototypes &&
+                                                                               prev_type->function.unspecified_parameters &&
+                                                                               !is_sym_main(symbol)) {
+                                                                       warningf(pos, "no previous prototype for '%#T'",
+                                                                                       orig_type, symbol);
+                                                               }
+                                                       } else if (new_storage_class == STORAGE_CLASS_NONE) {
+                                                               new_storage_class = STORAGE_CLASS_EXTERN;
+                                                       }
+                                                       break;
 
-                               default:
-                                       break;
+                                               default:
+                                                       break;
+                                       }
+                               } else if (is_type_incomplete(prev_type)) {
+                                       prev_decl->type = type;
                                }
-                       }
 
-                       if (old_storage_class == STORAGE_CLASS_EXTERN &&
-                                       new_storage_class == STORAGE_CLASS_EXTERN) {
+                               if (old_storage_class == STORAGE_CLASS_EXTERN &&
+                                               new_storage_class == STORAGE_CLASS_EXTERN) {
 warn_redundant_declaration:
-                               if (!is_definition           &&
-                                   warning.redundant_decls  &&
-                                   is_type_valid(prev_type) &&
-                                   strcmp(previous_entity->base.source_position.input_name,
-                                          "<builtin>") != 0) {
-                                       warningf(pos,
-                                                "redundant declaration for '%Y' (declared %P)",
-                                                symbol, &previous_entity->base.source_position);
-                               }
-                       } else if (current_function == NULL) {
-                               if (old_storage_class != STORAGE_CLASS_STATIC &&
-                                   new_storage_class == STORAGE_CLASS_STATIC) {
-                                       errorf(pos,
-                                              "static declaration of '%Y' follows non-static declaration (declared %P)",
-                                              symbol, &previous_entity->base.source_position);
-                               } else if (old_storage_class == STORAGE_CLASS_EXTERN) {
-                                       prev_decl->storage_class          = STORAGE_CLASS_NONE;
-                                       prev_decl->declared_storage_class = STORAGE_CLASS_NONE;
-                               } else {
-                                       /* ISO/IEC 14882:1998(E) §C.1.2:1 */
-                                       if (c_mode & _CXX)
-                                               goto error_redeclaration;
-                                       goto warn_redundant_declaration;
-                               }
-                       } else if (is_type_valid(prev_type)) {
-                               if (old_storage_class == new_storage_class) {
+                                       if (!is_definition           &&
+                                                       warning.redundant_decls  &&
+                                                       is_type_valid(prev_type) &&
+                                                       strcmp(previous_entity->base.source_position.input_name,
+                                                               "<builtin>") != 0) {
+                                               warningf(pos,
+                                                               "redundant declaration for '%Y' (declared %P)",
+                                                               symbol, &previous_entity->base.source_position);
+                                       }
+                               } else if (current_function == NULL) {
+                                       if (old_storage_class != STORAGE_CLASS_STATIC &&
+                                                       new_storage_class == STORAGE_CLASS_STATIC) {
+                                               errorf(pos,
+                                                               "static declaration of '%Y' follows non-static declaration (declared %P)",
+                                                               symbol, &previous_entity->base.source_position);
+                                       } else if (old_storage_class == STORAGE_CLASS_EXTERN) {
+                                               prev_decl->storage_class          = STORAGE_CLASS_NONE;
+                                               prev_decl->declared_storage_class = STORAGE_CLASS_NONE;
+                                       } else {
+                                               /* ISO/IEC 14882:1998(E) §C.1.2:1 */
+                                               if (c_mode & _CXX)
+                                                       goto error_redeclaration;
+                                               goto warn_redundant_declaration;
+                                       }
+                               } else if (is_type_valid(prev_type)) {
+                                       if (old_storage_class == new_storage_class) {
 error_redeclaration:
-                                       errorf(pos, "redeclaration of '%Y' (declared %P)",
-                                              symbol, &previous_entity->base.source_position);
-                               } else {
-                                       errorf(pos,
-                                              "redeclaration of '%Y' with different linkage (declared %P)",
-                                              symbol, &previous_entity->base.source_position);
+                                               errorf(pos, "redeclaration of '%Y' (declared %P)",
+                                                               symbol, &previous_entity->base.source_position);
+                                       } else {
+                                               errorf(pos,
+                                                               "redeclaration of '%Y' with different linkage (declared %P)",
+                                                               symbol, &previous_entity->base.source_position);
+                                       }
                                }
                        }
+
+                       prev_decl->modifiers |= decl->modifiers;
+                       if (entity->kind == ENTITY_FUNCTION) {
+                               previous_entity->function.is_inline |= entity->function.is_inline;
+                       }
+                       return previous_entity;
                }
 
-               prev_decl->modifiers |= decl->modifiers;
-               if (entity->kind == ENTITY_FUNCTION) {
-                       previous_entity->function.is_inline |= entity->function.is_inline;
+               if (warning.shadow) {
+                       warningf(pos, "%s '%Y' shadows %s (declared %P)",
+                                       get_entity_kind_name(entity->kind), symbol,
+                                       get_entity_kind_name(previous_entity->kind),
+                                       &previous_entity->base.source_position);
                }
-               return previous_entity;
        }
 
        if (entity->kind == ENTITY_FUNCTION) {
@@ -5245,7 +5280,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;
@@ -5295,7 +5330,8 @@ static void check_variable_type_complete(entity_t *ent)
        /* §6.7:7  If an identifier for an object is declared with no linkage, the
         *         type for the object shall be complete [...] */
        declaration_t *decl = &ent->declaration;
-       if (decl->storage_class != STORAGE_CLASS_NONE)
+       if (decl->storage_class == STORAGE_CLASS_EXTERN ||
+                       decl->storage_class == STORAGE_CLASS_STATIC)
                return;
 
        type_t *const orig_type = decl->type;
@@ -5303,11 +5339,9 @@ static void check_variable_type_complete(entity_t *ent)
        if (!is_type_incomplete(type))
                return;
 
-       /* GCC allows global arrays without size and assigns them a length of one,
-        * if no different declaration follows */
-       if (is_type_array(type) &&
-                       c_mode & _GNUC      &&
-                       ent->base.parent_scope == file_scope) {
+       /* §6.9.2:2 and §6.9.2:5: At the end of the translation incomplete arrays
+        * are given length one. */
+       if (is_type_array(type) && ent->base.parent_scope == file_scope) {
                ARR_APP1(declaration_t*, incomplete_arrays, decl);
                return;
        }
@@ -5410,7 +5444,7 @@ static type_t *get_default_promoted_type(type_t *orig_type)
        type_t *type = skip_typeref(orig_type);
        if (is_type_integer(type)) {
                result = promote_integer(type);
-       } else if (type == type_float) {
+       } else if (is_type_atomic(type, ATOMIC_TYPE_FLOAT)) {
                result = type_double;
        }
 
@@ -5466,11 +5500,14 @@ decl_list_end:
        /* update function type */
        type_t *new_type = duplicate_type(type);
 
-       function_parameter_t *parameters     = NULL;
-       function_parameter_t *last_parameter = NULL;
+       function_parameter_t  *parameters = NULL;
+       function_parameter_t **anchor     = &parameters;
 
        parameter = entity->function.parameters.entities;
        for (; parameter != NULL; parameter = parameter->base.next) {
+               if (parameter->kind != ENTITY_PARAMETER)
+                       continue;
+
                type_t *parameter_type = parameter->declaration.type;
                if (parameter_type == NULL) {
                        if (strict_mode) {
@@ -5494,30 +5531,21 @@ decl_list_end:
                 */
                parameter_type = get_default_promoted_type(parameter_type);
 
-               function_parameter_t *function_parameter
-                       = obstack_alloc(type_obst, sizeof(function_parameter[0]));
-               memset(function_parameter, 0, sizeof(function_parameter[0]));
+               function_parameter_t *const parameter =
+                       allocate_parameter(parameter_type);
 
-               function_parameter->type = parameter_type;
-               if (last_parameter != NULL) {
-                       last_parameter->next = function_parameter;
-               } else {
-                       parameters = function_parameter;
-               }
-               last_parameter = function_parameter;
+               *anchor = parameter;
+               anchor  = &parameter->next;
        }
 
-       /* § 6.9.1.7: A K&R style parameter list does NOT act as a function
+       /* §6.9.1.7: A K&R style parameter list does NOT act as a function
         * prototype */
        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('{');
 }
@@ -5576,9 +5604,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;
 
@@ -5597,9 +5626,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;
        }
 }
 
@@ -5652,6 +5678,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)
 {
@@ -5689,17 +5716,20 @@ static bool expression_returns(expression_t const *const expr)
                case EXPR_SIZEOF: // TODO handle obscure VLA case
                case EXPR_ALIGNOF:
                case EXPR_FUNCNAME:
-               case EXPR_BUILTIN_SYMBOL:
                case EXPR_BUILTIN_CONSTANT_P:
-               case EXPR_BUILTIN_PREFETCH:
+               case EXPR_BUILTIN_TYPES_COMPATIBLE_P:
                case EXPR_OFFSETOF:
                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
@@ -5785,7 +5815,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;
@@ -5811,6 +5840,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: {
@@ -6035,6 +6066,9 @@ found_break_parent:
                        }
                        break;
                }
+
+               default:
+                       panic("invalid statement kind");
        }
 
        while (next == NULL) {
@@ -6042,7 +6076,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                    &&
@@ -6059,7 +6093,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:
@@ -6070,6 +6103,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:
@@ -6291,7 +6329,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)) {
@@ -6300,6 +6339,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 &&
@@ -6316,18 +6360,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;
        }
 
@@ -6492,53 +6533,56 @@ 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 != '}') {
+                                                       errorf(&entity->base.source_position,
+                                                                       "compound member '%Y' has incomplete type '%T'",
+                                                                       entity->base.symbol, orig_type);
+                                               }
+                                       }
+                               }
+
+                               append_entity(&compound->members, entity);
                        }
                }
 
@@ -6602,7 +6646,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;
 };
 
@@ -6762,11 +6806,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;
@@ -6791,27 +6832,15 @@ static entity_t *create_implicit_function(symbol_t *symbol,
 static type_t *make_function_2_type(type_t *return_type, type_t *argument_type1,
                                     type_t *argument_type2)
 {
-       function_parameter_t *parameter2
-               = obstack_alloc(type_obst, sizeof(parameter2[0]));
-       memset(parameter2, 0, sizeof(parameter2[0]));
-       parameter2->type = argument_type2;
-
-       function_parameter_t *parameter1
-               = obstack_alloc(type_obst, sizeof(parameter1[0]));
-       memset(parameter1, 0, sizeof(parameter1[0]));
-       parameter1->type = argument_type1;
+       function_parameter_t *const parameter2 = allocate_parameter(argument_type2);
+       function_parameter_t *const parameter1 = allocate_parameter(argument_type1);
        parameter1->next = parameter2;
 
        type_t *type               = allocate_type_zero(TYPE_FUNCTION);
        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);
 }
 
 /**
@@ -6823,72 +6852,56 @@ static type_t *make_function_2_type(type_t *return_type, type_t *argument_type1,
  */
 static type_t *make_function_1_type(type_t *return_type, type_t *argument_type)
 {
-       function_parameter_t *parameter
-               = obstack_alloc(type_obst, sizeof(parameter[0]));
-       memset(parameter, 0, sizeof(parameter[0]));
-       parameter->type = argument_type;
+       function_parameter_t *const parameter = allocate_parameter(argument_type);
 
        type_t *type               = allocate_type_zero(TYPE_FUNCTION);
        type->function.return_type = return_type;
        type->function.parameters  = parameter;
 
-       type_t *result = typehash_insert(type);
-       if (result != type) {
-               free_type(type);
-       }
+       return identify_new_type(type);
+}
 
-       return result;
+static type_t *make_function_1_type_variadic(type_t *return_type, type_t *argument_type)
+{
+       type_t *res = make_function_1_type(return_type, argument_type);
+       res->function.variadic = 1;
+       return res;
 }
 
+/**
+ * Creates a return_type (func)(void) function type if not
+ * already exists.
+ *
+ * @param return_type    the return type
+ */
 static type_t *make_function_0_type(type_t *return_type)
 {
        type_t *type               = allocate_type_zero(TYPE_FUNCTION);
        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);
 }
 
 /**
- * Creates a function type for some function like builtins.
+ * Creates a NO_RETURN return_type (func)(void) function type if not
+ * already exists.
  *
- * @param symbol   the symbol describing the builtin
- */
-static type_t *get_builtin_symbol_type(symbol_t *symbol)
-{
-       switch (symbol->ID) {
-       case T___builtin_alloca:
-               return make_function_1_type(type_void_ptr, type_size_t);
-       case T___builtin_huge_val:
-               return make_function_0_type(type_double);
-       case T___builtin_inf:
-               return make_function_0_type(type_double);
-       case T___builtin_inff:
-               return make_function_0_type(type_float);
-       case T___builtin_infl:
-               return make_function_0_type(type_long_double);
-       case T___builtin_nan:
-               return make_function_1_type(type_double, type_char_ptr);
-       case T___builtin_nanf:
-               return make_function_1_type(type_float, type_char_ptr);
-       case T___builtin_nanl:
-               return make_function_1_type(type_long_double, type_char_ptr);
-       case T___builtin_va_end:
-               return make_function_1_type(type_void, type_valist);
-       case T___builtin_expect:
-               return make_function_2_type(type_long, type_long, type_long);
-       default:
-               internal_errorf(HERE, "not implemented builtin identifier found");
-       }
+ * @param return_type    the return type
+ */
+static type_t *make_function_0_type_noreturn(type_t *return_type)
+{
+       type_t *type               = allocate_type_zero(TYPE_FUNCTION);
+       type->function.return_type = return_type;
+       type->function.parameters  = NULL;
+       type->function.base.modifiers |= DM_NORETURN;
+       return type;
+
+       return identify_new_type(type);
 }
 
 /**
- * Performs automatic type cast as described in § 6.3.2.1.
+ * Performs automatic type cast as described in §6.3.2.1.
  *
  * @param orig_type  the original type
  */
@@ -6912,7 +6925,7 @@ static type_t *automatic_type_conversion(type_t *orig_type)
 
 /**
  * reverts the automatic casts of array to pointer types and function
- * to function-pointer types as defined § 6.3.2.1
+ * to function-pointer types as defined §6.3.2.1
  */
 type_t *revert_automatic_type_conversion(const expression_t *expression)
 {
@@ -6933,25 +6946,22 @@ 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;
                }
 
-               case EXPR_BUILTIN_SYMBOL:
-                       return get_builtin_symbol_type(expression->builtin_symbol.symbol);
-
                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;
                }
 
@@ -6968,10 +6978,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)
@@ -7180,6 +7189,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 */
@@ -7446,24 +7456,8 @@ end_error:
        return create_invalid_expression();
 }
 
-static expression_t *parse_builtin_symbol(void)
-{
-       expression_t *expression = allocate_expression_zero(EXPR_BUILTIN_SYMBOL);
-
-       symbol_t *symbol = token.v.symbol;
-
-       expression->builtin_symbol.symbol = symbol;
-       next_token();
-
-       type_t *type = get_builtin_symbol_type(symbol);
-       type = automatic_type_conversion(type);
-
-       expression->base.type = type;
-       return expression;
-}
-
 /**
- * Parses a __builtin_constant() expression.
+ * Parses a __builtin_constant_p() expression.
  */
 static expression_t *parse_builtin_constant(void)
 {
@@ -7484,28 +7478,24 @@ end_error:
 }
 
 /**
- * Parses a __builtin_prefetch() expression.
+ * Parses a __builtin_types_compatible_p() expression.
  */
-static expression_t *parse_builtin_prefetch(void)
+static expression_t *parse_builtin_types_compatible(void)
 {
-       expression_t *expression = allocate_expression_zero(EXPR_BUILTIN_PREFETCH);
+       expression_t *expression = allocate_expression_zero(EXPR_BUILTIN_TYPES_COMPATIBLE_P);
 
-       eat(T___builtin_prefetch);
+       eat(T___builtin_types_compatible_p);
 
        expect('(', end_error);
        add_anchor_token(')');
-       expression->builtin_prefetch.adr = parse_assignment_expression();
-       if (token.type == ',') {
-               next_token();
-               expression->builtin_prefetch.rw = parse_assignment_expression();
-       }
-       if (token.type == ',') {
-               next_token();
-               expression->builtin_prefetch.locality = parse_assignment_expression();
-       }
+       add_anchor_token(',');
+       expression->builtin_types_compatible.left = parse_typename();
+       rem_anchor_token(',');
+       expect(',', end_error);
+       expression->builtin_types_compatible.right = parse_typename();
        rem_anchor_token(')');
        expect(')', end_error);
-       expression->base.type = type_void;
+       expression->base.type = type_int;
 
        return expression;
 end_error:
@@ -7724,49 +7714,39 @@ end_error:
 static expression_t *parse_primary_expression(void)
 {
        switch (token.type) {
-               case T_false:                    return parse_bool_const(false);
-               case T_true:                     return parse_bool_const(true);
-               case T_INTEGER:                  return parse_int_const();
-               case T_CHARACTER_CONSTANT:       return parse_character_constant();
-               case T_WIDE_CHARACTER_CONSTANT:  return parse_wide_character_constant();
-               case T_FLOATINGPOINT:            return parse_float_const();
+               case T_false:                        return parse_bool_const(false);
+               case T_true:                         return parse_bool_const(true);
+               case T_INTEGER:                      return parse_int_const();
+               case T_CHARACTER_CONSTANT:           return parse_character_constant();
+               case T_WIDE_CHARACTER_CONSTANT:      return parse_wide_character_constant();
+               case T_FLOATINGPOINT:                return parse_float_const();
                case T_STRING_LITERAL:
-               case T_WIDE_STRING_LITERAL:      return parse_string_const();
-               case T_IDENTIFIER:               return parse_reference();
+               case T_WIDE_STRING_LITERAL:          return parse_string_const();
+               case T_IDENTIFIER:                   return parse_reference();
                case T___FUNCTION__:
-               case T___func__:                 return parse_function_keyword();
-               case T___PRETTY_FUNCTION__:      return parse_pretty_function_keyword();
-               case T___FUNCSIG__:              return parse_funcsig_keyword();
-               case T___FUNCDNAME__:            return parse_funcdname_keyword();
-               case T___builtin_offsetof:       return parse_offsetof();
-               case T___builtin_va_start:       return parse_va_start();
-               case T___builtin_va_arg:         return parse_va_arg();
-               case T___builtin_expect:
-               case T___builtin_alloca:
-               case T___builtin_inf:
-               case T___builtin_inff:
-               case T___builtin_infl:
-               case T___builtin_nan:
-               case T___builtin_nanf:
-               case T___builtin_nanl:
-               case T___builtin_huge_val:
-               case T___builtin_va_end:         return parse_builtin_symbol();
+               case T___func__:                     return parse_function_keyword();
+               case T___PRETTY_FUNCTION__:          return parse_pretty_function_keyword();
+               case T___FUNCSIG__:                  return parse_funcsig_keyword();
+               case T___FUNCDNAME__:                return parse_funcdname_keyword();
+               case T___builtin_offsetof:           return parse_offsetof();
+               case T___builtin_va_start:           return parse_va_start();
+               case T___builtin_va_arg:             return parse_va_arg();
                case T___builtin_isgreater:
                case T___builtin_isgreaterequal:
                case T___builtin_isless:
                case T___builtin_islessequal:
                case T___builtin_islessgreater:
-               case T___builtin_isunordered:    return parse_compare_builtin();
-               case T___builtin_constant_p:     return parse_builtin_constant();
-               case T___builtin_prefetch:       return parse_builtin_prefetch();
-               case T__assume:                  return parse_assume();
+               case T___builtin_isunordered:        return parse_compare_builtin();
+               case T___builtin_constant_p:         return parse_builtin_constant();
+               case T___builtin_types_compatible_p: return parse_builtin_types_compatible();
+               case T__assume:                      return parse_assume();
                case T_ANDAND:
                        if (GNU_MODE)
                                return parse_label_address();
                        break;
 
-               case '(':                        return parse_parenthesized_expression();
-               case T___noop:                   return parse_noop_expression();
+               case '(':                            return parse_parenthesized_expression();
+               case T___noop:                       return parse_noop_expression();
        }
 
        errorf(HERE, "unexpected token %K, expected an expression", &token);
@@ -8042,6 +8022,51 @@ static void check_call_argument(const function_parameter_t *parameter,
        }
 }
 
+/**
+ * Handle the semantic restrictions of builtin calls
+ */
+static void handle_builtin_argument_restrictions(call_expression_t *call) {
+       switch (call->function->reference.entity->function.btk) {
+               case bk_gnu_builtin_return_address:
+               case bk_gnu_builtin_frame_address: {
+                       /* argument must be constant */
+                       call_argument_t *argument = call->arguments;
+
+                       if (! is_constant_expression(argument->expression)) {
+                               errorf(&call->base.source_position,
+                                      "argument of '%Y' must be a constant expression",
+                                      call->function->reference.entity->base.symbol);
+                       }
+                       break;
+               }
+               case bk_gnu_builtin_prefetch: {
+                       /* second and third argument must be constant if existent */
+                       call_argument_t *rw = call->arguments->next;
+                       call_argument_t *locality = NULL;
+
+                       if (rw != NULL) {
+                               if (! is_constant_expression(rw->expression)) {
+                                       errorf(&call->base.source_position,
+                                              "second argument of '%Y' must be a constant expression",
+                                              call->function->reference.entity->base.symbol);
+                               }
+                               locality = rw->next;
+                       }
+                       if (locality != NULL) {
+                               if (! is_constant_expression(locality->expression)) {
+                                       errorf(&call->base.source_position,
+                                              "third argument of '%Y' must be a constant expression",
+                                              call->function->reference.entity->base.symbol);
+                               }
+                               locality = rw->next;
+                       }
+                       break;
+               }
+               default:
+                       break;
+       }
+}
+
 /**
  * Parse a call expression, ie. expression '( ... )'.
  *
@@ -8076,18 +8101,13 @@ static expression_t *parse_call_expression(expression_t *expression)
        add_anchor_token(',');
 
        if (token.type != ')') {
-               call_argument_t *last_argument = NULL;
-
-               while (true) {
-                       call_argument_t *argument = allocate_ast_zero(sizeof(argument[0]));
-
+               call_argument_t **anchor = &call->arguments;
+               for (;;) {
+                       call_argument_t *argument = allocate_ast_zero(sizeof(*argument));
                        argument->expression = parse_assignment_expression();
-                       if (last_argument == NULL) {
-                               call->arguments = argument;
-                       } else {
-                               last_argument->next = argument;
-                       }
-                       last_argument = argument;
+
+                       *anchor = argument;
+                       anchor  = &argument->next;
 
                        if (token.type != ',')
                                break;
@@ -8134,6 +8154,13 @@ static expression_t *parse_call_expression(expression_t *expression)
                         "function call has aggregate value");
        }
 
+       if (call->function->kind == EXPR_REFERENCE) {
+               reference_expression_t *reference = &call->function->reference;
+               if (reference->entity->kind == ENTITY_FUNCTION &&
+                   reference->entity->function.btk != bk_none)
+                       handle_builtin_argument_restrictions(call);
+       }
+
 end_error:
        return result;
 }
@@ -8242,6 +8269,7 @@ static expression_t *parse_conditional_expression(expression_t *expression)
        }
        rem_anchor_token(':');
        expect(':', end_error);
+end_error:;
        expression_t *false_expression =
                parse_sub_expression(c_mode & _CXX ? PREC_ASSIGNMENT : PREC_CONDITIONAL);
 
@@ -8350,8 +8378,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();
 }
 
 /**
@@ -8413,8 +8439,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,
@@ -8498,7 +8526,7 @@ 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_ARRAY_ACCESS:
        case EXPR_COMPOUND_LITERAL:
@@ -8722,7 +8750,7 @@ static type_t *semantic_arithmetic(type_t *type_left, type_t *type_right)
        type_left  = get_unqualified_type(type_left);
        type_right = get_unqualified_type(type_right);
 
-       /* § 6.3.1.8 Usual arithmetic conversions */
+       /* §6.3.1.8 Usual arithmetic conversions */
        if (type_left == type_long_double || type_right == type_long_double) {
                return type_long_double;
        } else if (type_left == type_double || type_right == type_double) {
@@ -8824,11 +8852,28 @@ static void warn_div_by_zero(binary_expression_t const *const expression)
 /**
  * Check the semantic restrictions for a div/mod expression.
  */
-static void semantic_divmod_arithmetic(binary_expression_t *expression) {
+static void semantic_divmod_arithmetic(binary_expression_t *expression)
+{
        semantic_binexpr_arithmetic(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;
@@ -8847,6 +8892,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);
 
@@ -8864,13 +8914,12 @@ static void semantic_add(binary_expression_t *expression)
        type_t       *const type_left       = skip_typeref(orig_type_left);
        type_t       *const type_right      = skip_typeref(orig_type_right);
 
-       /* § 6.5.6 */
+       /* §6.5.6 */
        if (is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) {
                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;
-               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);
@@ -8896,13 +8945,12 @@ static void semantic_sub(binary_expression_t *expression)
        type_t                  *const type_right      = skip_typeref(orig_type_right);
        source_position_t const *const pos             = &expression->base.source_position;
 
-       /* § 5.6.5 */
+       /* §5.6.5 */
        if (is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) {
                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;
-               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);
@@ -8964,6 +9012,13 @@ static void warn_comparison_in_comparison(const expression_t *const expr)
        }
 }
 
+static bool maybe_negative(expression_t const *const expr)
+{
+       return
+               !is_constant_expression(expr) ||
+               fold_constant(expr) < 0;
+}
+
 /**
  * Check the semantics of comparison expressions.
  *
@@ -9005,37 +9060,23 @@ static void semantic_comparison(binary_expression_t *expression)
 
        /* TODO non-arithmetic types */
        if (is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) {
+               type_t *arithmetic_type = semantic_arithmetic(type_left, 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;
-                       }
-
-                       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;
+               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;
@@ -9248,64 +9289,64 @@ static void semantic_binexpr_assign(binary_expression_t *expression)
 static bool expression_has_effect(const expression_t *const expr)
 {
        switch (expr->kind) {
-               case EXPR_UNKNOWN:                   break;
-               case EXPR_INVALID:                   return true; /* do NOT warn */
-               case EXPR_REFERENCE:                 return false;
-               case EXPR_REFERENCE_ENUM_VALUE:      return false;
+               case EXPR_UNKNOWN:                    break;
+               case EXPR_INVALID:                    return true; /* do NOT warn */
+               case EXPR_REFERENCE:                  return false;
+               case EXPR_REFERENCE_ENUM_VALUE:       return false;
                /* suppress the warning for microsoft __noop operations */
-               case EXPR_CONST:                     return expr->conste.is_ms_noop;
-               case EXPR_CHARACTER_CONSTANT:        return false;
-               case EXPR_WIDE_CHARACTER_CONSTANT:   return false;
-               case EXPR_STRING_LITERAL:            return false;
-               case EXPR_WIDE_STRING_LITERAL:       return false;
-               case EXPR_LABEL_ADDRESS:             return false;
+               case EXPR_CONST:                      return expr->conste.is_ms_noop;
+               case EXPR_CHARACTER_CONSTANT:         return false;
+               case EXPR_WIDE_CHARACTER_CONSTANT:    return false;
+               case EXPR_STRING_LITERAL:             return false;
+               case EXPR_WIDE_STRING_LITERAL:        return false;
+               case EXPR_LABEL_ADDRESS:              return false;
 
                case EXPR_CALL: {
                        const call_expression_t *const call = &expr->call;
-                       if (call->function->kind != EXPR_BUILTIN_SYMBOL)
+                       if (call->function->kind != EXPR_REFERENCE)
                                return true;
 
-                       switch (call->function->builtin_symbol.symbol->ID) {
-                               case T___builtin_va_end: return true;
-                               default:                 return false;
+                       switch (call->function->reference.entity->function.btk) {
+                               /* FIXME: which builtins have no effect? */
+                               default:                      return true;
                        }
                }
 
                /* Generate the warning if either the left or right hand side of a
                 * conditional expression has no effect */
                case EXPR_CONDITIONAL: {
-                       const conditional_expression_t *const cond = &expr->conditional;
+                       conditional_expression_t const *const cond = &expr->conditional;
+                       expression_t             const *const t    = cond->true_expression;
                        return
-                               expression_has_effect(cond->true_expression) &&
+                               (t == NULL || expression_has_effect(t)) &&
                                expression_has_effect(cond->false_expression);
                }
 
-               case EXPR_SELECT:                    return false;
-               case EXPR_ARRAY_ACCESS:              return false;
-               case EXPR_SIZEOF:                    return false;
-               case EXPR_CLASSIFY_TYPE:             return false;
-               case EXPR_ALIGNOF:                   return false;
-
-               case EXPR_FUNCNAME:                  return false;
-               case EXPR_BUILTIN_SYMBOL:            break; /* handled in EXPR_CALL */
-               case EXPR_BUILTIN_CONSTANT_P:        return false;
-               case EXPR_BUILTIN_PREFETCH:          return true;
-               case EXPR_OFFSETOF:                  return false;
-               case EXPR_VA_START:                  return true;
-               case EXPR_VA_ARG:                    return true;
-               case EXPR_STATEMENT:                 return true; // TODO
-               case EXPR_COMPOUND_LITERAL:          return false;
-
-               case EXPR_UNARY_NEGATE:              return false;
-               case EXPR_UNARY_PLUS:                return false;
-               case EXPR_UNARY_BITWISE_NEGATE:      return false;
-               case EXPR_UNARY_NOT:                 return false;
-               case EXPR_UNARY_DEREFERENCE:         return false;
-               case EXPR_UNARY_TAKE_ADDRESS:        return false;
-               case EXPR_UNARY_POSTFIX_INCREMENT:   return true;
-               case EXPR_UNARY_POSTFIX_DECREMENT:   return true;
-               case EXPR_UNARY_PREFIX_INCREMENT:    return true;
-               case EXPR_UNARY_PREFIX_DECREMENT:    return true;
+               case EXPR_SELECT:                     return false;
+               case EXPR_ARRAY_ACCESS:               return false;
+               case EXPR_SIZEOF:                     return false;
+               case EXPR_CLASSIFY_TYPE:              return false;
+               case EXPR_ALIGNOF:                    return false;
+
+               case EXPR_FUNCNAME:                   return false;
+               case EXPR_BUILTIN_CONSTANT_P:         return false;
+               case EXPR_BUILTIN_TYPES_COMPATIBLE_P: return false;
+               case EXPR_OFFSETOF:                   return false;
+               case EXPR_VA_START:                   return true;
+               case EXPR_VA_ARG:                     return true;
+               case EXPR_STATEMENT:                  return true; // TODO
+               case EXPR_COMPOUND_LITERAL:           return false;
+
+               case EXPR_UNARY_NEGATE:               return false;
+               case EXPR_UNARY_PLUS:                 return false;
+               case EXPR_UNARY_BITWISE_NEGATE:       return false;
+               case EXPR_UNARY_NOT:                  return false;
+               case EXPR_UNARY_DEREFERENCE:          return false;
+               case EXPR_UNARY_TAKE_ADDRESS:         return false;
+               case EXPR_UNARY_POSTFIX_INCREMENT:    return true;
+               case EXPR_UNARY_POSTFIX_DECREMENT:    return true;
+               case EXPR_UNARY_PREFIX_INCREMENT:     return true;
+               case EXPR_UNARY_PREFIX_DECREMENT:     return true;
 
                /* Treat void casts as if they have an effect in order to being able to
                 * suppress the warning */
@@ -9314,39 +9355,39 @@ static bool expression_has_effect(const expression_t *const expr)
                        return is_type_atomic(type, ATOMIC_TYPE_VOID);
                }
 
-               case EXPR_UNARY_CAST_IMPLICIT:       return true;
-               case EXPR_UNARY_ASSUME:              return true;
-               case EXPR_UNARY_DELETE:              return true;
-               case EXPR_UNARY_DELETE_ARRAY:        return true;
-               case EXPR_UNARY_THROW:               return true;
-
-               case EXPR_BINARY_ADD:                return false;
-               case EXPR_BINARY_SUB:                return false;
-               case EXPR_BINARY_MUL:                return false;
-               case EXPR_BINARY_DIV:                return false;
-               case EXPR_BINARY_MOD:                return false;
-               case EXPR_BINARY_EQUAL:              return false;
-               case EXPR_BINARY_NOTEQUAL:           return false;
-               case EXPR_BINARY_LESS:               return false;
-               case EXPR_BINARY_LESSEQUAL:          return false;
-               case EXPR_BINARY_GREATER:            return false;
-               case EXPR_BINARY_GREATEREQUAL:       return false;
-               case EXPR_BINARY_BITWISE_AND:        return false;
-               case EXPR_BINARY_BITWISE_OR:         return false;
-               case EXPR_BINARY_BITWISE_XOR:        return false;
-               case EXPR_BINARY_SHIFTLEFT:          return false;
-               case EXPR_BINARY_SHIFTRIGHT:         return false;
-               case EXPR_BINARY_ASSIGN:             return true;
-               case EXPR_BINARY_MUL_ASSIGN:         return true;
-               case EXPR_BINARY_DIV_ASSIGN:         return true;
-               case EXPR_BINARY_MOD_ASSIGN:         return true;
-               case EXPR_BINARY_ADD_ASSIGN:         return true;
-               case EXPR_BINARY_SUB_ASSIGN:         return true;
-               case EXPR_BINARY_SHIFTLEFT_ASSIGN:   return true;
-               case EXPR_BINARY_SHIFTRIGHT_ASSIGN:  return true;
-               case EXPR_BINARY_BITWISE_AND_ASSIGN: return true;
-               case EXPR_BINARY_BITWISE_XOR_ASSIGN: return true;
-               case EXPR_BINARY_BITWISE_OR_ASSIGN:  return true;
+               case EXPR_UNARY_CAST_IMPLICIT:        return true;
+               case EXPR_UNARY_ASSUME:               return true;
+               case EXPR_UNARY_DELETE:               return true;
+               case EXPR_UNARY_DELETE_ARRAY:         return true;
+               case EXPR_UNARY_THROW:                return true;
+
+               case EXPR_BINARY_ADD:                 return false;
+               case EXPR_BINARY_SUB:                 return false;
+               case EXPR_BINARY_MUL:                 return false;
+               case EXPR_BINARY_DIV:                 return false;
+               case EXPR_BINARY_MOD:                 return false;
+               case EXPR_BINARY_EQUAL:               return false;
+               case EXPR_BINARY_NOTEQUAL:            return false;
+               case EXPR_BINARY_LESS:                return false;
+               case EXPR_BINARY_LESSEQUAL:           return false;
+               case EXPR_BINARY_GREATER:             return false;
+               case EXPR_BINARY_GREATEREQUAL:        return false;
+               case EXPR_BINARY_BITWISE_AND:         return false;
+               case EXPR_BINARY_BITWISE_OR:          return false;
+               case EXPR_BINARY_BITWISE_XOR:         return false;
+               case EXPR_BINARY_SHIFTLEFT:           return false;
+               case EXPR_BINARY_SHIFTRIGHT:          return false;
+               case EXPR_BINARY_ASSIGN:              return true;
+               case EXPR_BINARY_MUL_ASSIGN:          return true;
+               case EXPR_BINARY_DIV_ASSIGN:          return true;
+               case EXPR_BINARY_MOD_ASSIGN:          return true;
+               case EXPR_BINARY_ADD_ASSIGN:          return true;
+               case EXPR_BINARY_SUB_ASSIGN:          return true;
+               case EXPR_BINARY_SHIFTLEFT_ASSIGN:    return true;
+               case EXPR_BINARY_SHIFTRIGHT_ASSIGN:   return true;
+               case EXPR_BINARY_BITWISE_AND_ASSIGN:  return true;
+               case EXPR_BINARY_BITWISE_XOR_ASSIGN:  return true;
+               case EXPR_BINARY_BITWISE_OR_ASSIGN:   return true;
 
                /* Only examine the right hand side of && and ||, because the left hand
                 * side already has the effect of controlling the execution of the right
@@ -9358,12 +9399,12 @@ static bool expression_has_effect(const expression_t *const expr)
                case EXPR_BINARY_COMMA:
                        return expression_has_effect(expr->binary.right);
 
-               case EXPR_BINARY_ISGREATER:          return false;
-               case EXPR_BINARY_ISGREATEREQUAL:     return false;
-               case EXPR_BINARY_ISLESS:             return false;
-               case EXPR_BINARY_ISLESSEQUAL:        return false;
-               case EXPR_BINARY_ISLESSGREATER:      return false;
-               case EXPR_BINARY_ISUNORDERED:        return false;
+               case EXPR_BINARY_ISGREATER:           return false;
+               case EXPR_BINARY_ISGREATEREQUAL:      return false;
+               case EXPR_BINARY_ISLESS:              return false;
+               case EXPR_BINARY_ISLESSEQUAL:         return false;
+               case EXPR_BINARY_ISLESSGREATER:       return false;
+               case EXPR_BINARY_ISUNORDERED:         return false;
        }
 
        internal_errorf(HERE, "unexpected expression");
@@ -9505,7 +9546,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];
 
@@ -10017,7 +10058,8 @@ end_error:
  *
  * @param statement  the switch statement to check
  */
-static void check_enum_cases(const switch_statement_t *statement) {
+static void check_enum_cases(const switch_statement_t *statement)
+{
        const type_t *type = skip_typeref(statement->expression->base.type);
        if (! is_type_enum(type))
                return;
@@ -10510,12 +10552,11 @@ static statement_t *parse_declaration_statement(void)
                parse_declaration(record_entity, DECL_FLAGS_NONE);
        }
 
-       if (before == NULL) {
-               statement->declaration.declarations_begin = current_scope->entities;
-       } else {
-               statement->declaration.declarations_begin = before->base.next;
-       }
-       statement->declaration.declarations_end = current_scope->last_entity;
+       declaration_statement_t *const decl  = &statement->declaration;
+       entity_t                *const begin =
+               before != NULL ? before->base.next : current_scope->entities;
+       decl->declarations_begin = begin;
+       decl->declarations_end   = begin != NULL ? current_scope->last_entity : NULL;
 
        return statement;
 }
@@ -10655,10 +10696,13 @@ static void parse_namespace_definition(void)
                next_token();
 
                entity = get_entity(symbol, NAMESPACE_NORMAL);
-               if (entity != NULL && entity->kind != ENTITY_NAMESPACE
-                               && entity->base.parent_scope == current_scope) {
-                       error_redefined_as_different_kind(&token.source_position,
-                                                         entity, ENTITY_NAMESPACE);
+               if (entity       != NULL             &&
+                               entity->kind != ENTITY_NAMESPACE &&
+                               entity->base.parent_scope == current_scope) {
+                       if (!is_error_entity(entity)) {
+                               error_redefined_as_different_kind(&token.source_position,
+                                               entity, ENTITY_NAMESPACE);
+                       }
                        entity = NULL;
                }
        }
@@ -11279,6 +11323,10 @@ void start_parsing(void)
 
        assert(current_scope == NULL);
        scope_push(&unit->scope);
+
+       create_gnu_builtins();
+       if (c_mode & _MS)
+               create_microsoft_intrinsics();
 }
 
 translation_unit_t *finish_parsing(void)
@@ -11298,8 +11346,8 @@ translation_unit_t *finish_parsing(void)
        return result;
 }
 
-/* GCC allows global arrays without size and assigns them a length of one,
- * if no different declaration follows */
+/* §6.9.2:2 and §6.9.2:5: At the end of the translation incomplete arrays
+ * are given length one. */
 static void complete_incomplete_arrays(void)
 {
        size_t n = ARR_LEN(incomplete_arrays);
@@ -11322,9 +11370,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;
        }
@@ -11344,6 +11390,103 @@ void parse(void)
        incomplete_arrays = NULL;
 }
 
+/**
+ * create a builtin function.
+ */
+static entity_t *create_builtin_function(builtin_kind_t kind, const char *name, type_t *function_type)
+{
+       symbol_t *symbol = symbol_table_insert(name);
+       entity_t *entity = allocate_entity_zero(ENTITY_FUNCTION);
+       entity->declaration.storage_class          = STORAGE_CLASS_EXTERN;
+       entity->declaration.declared_storage_class = STORAGE_CLASS_EXTERN;
+       entity->declaration.type                   = function_type;
+       entity->declaration.implicit               = true;
+       entity->base.symbol                        = symbol;
+       entity->base.source_position               = builtin_source_position;
+
+       entity->function.btk                       = kind;
+
+       record_entity(entity, /*is_definition=*/false);
+       return entity;
+}
+
+
+/**
+ * Create predefined gnu builtins.
+ */
+static void create_gnu_builtins(void)
+{
+#define GNU_BUILTIN(a, b) create_builtin_function(bk_gnu_builtin_##a, "__builtin_" #a, b)
+
+       GNU_BUILTIN(alloca,         make_function_1_type(type_void_ptr, type_size_t));
+       GNU_BUILTIN(huge_val,       make_function_0_type(type_double));
+       GNU_BUILTIN(inf,            make_function_0_type(type_double));
+       GNU_BUILTIN(inff,           make_function_0_type(type_float));
+       GNU_BUILTIN(infl,           make_function_0_type(type_long_double));
+       GNU_BUILTIN(nan,            make_function_1_type(type_double, type_char_ptr));
+       GNU_BUILTIN(nanf,           make_function_1_type(type_float, type_char_ptr));
+       GNU_BUILTIN(nanl,           make_function_1_type(type_long_double, type_char_ptr));
+       GNU_BUILTIN(va_end,         make_function_1_type(type_void, type_valist));
+       GNU_BUILTIN(expect,         make_function_2_type(type_long, type_long, type_long));
+       GNU_BUILTIN(return_address, make_function_1_type(type_void_ptr, type_unsigned_int));
+       GNU_BUILTIN(frame_address,  make_function_1_type(type_void_ptr, type_unsigned_int));
+       GNU_BUILTIN(ffs,            make_function_1_type(type_int, type_unsigned_int));
+       GNU_BUILTIN(clz,            make_function_1_type(type_int, type_unsigned_int));
+       GNU_BUILTIN(ctz,            make_function_1_type(type_int, type_unsigned_int));
+       GNU_BUILTIN(popcount,       make_function_1_type(type_int, type_unsigned_int));
+       GNU_BUILTIN(parity,         make_function_1_type(type_int, type_unsigned_int));
+       GNU_BUILTIN(prefetch,       make_function_1_type_variadic(type_float, type_void_ptr));
+       GNU_BUILTIN(trap,           make_function_0_type_noreturn(type_void));
+
+#undef GNU_BUILTIN
+}
+
+/**
+ * Create predefined MS intrinsics.
+ */
+static void create_microsoft_intrinsics(void)
+{
+#define MS_BUILTIN(a, b) create_builtin_function(bk_ms##a, #a, b)
+
+       /* intrinsics for all architectures */
+       MS_BUILTIN(_rotl,                  make_function_2_type(type_unsigned_int,   type_unsigned_int, type_int));
+       MS_BUILTIN(_rotr,                  make_function_2_type(type_unsigned_int,   type_unsigned_int, type_int));
+       MS_BUILTIN(_rotl64,                make_function_2_type(type_unsigned_int64, type_unsigned_int64, type_int));
+       MS_BUILTIN(_rotr64,                make_function_2_type(type_unsigned_int64, type_unsigned_int64, type_int));
+       MS_BUILTIN(_byteswap_ushort,       make_function_1_type(type_unsigned_short, type_unsigned_short));
+       MS_BUILTIN(_byteswap_ulong,        make_function_1_type(type_unsigned_long,  type_unsigned_long));
+       MS_BUILTIN(_byteswap_uint64,       make_function_1_type(type_unsigned_int64, type_unsigned_int64));
+
+       MS_BUILTIN(__debugbreak,    make_function_0_type(type_void));
+       MS_BUILTIN(_ReturnAddress,  make_function_0_type(type_void_ptr));
+       MS_BUILTIN(__popcount,      make_function_1_type(type_unsigned_int, type_unsigned_int));
+
+       /* x86/x64 only */
+       MS_BUILTIN(_enable,                make_function_0_type(type_void));
+       MS_BUILTIN(_disable,               make_function_0_type(type_void));
+       MS_BUILTIN(__inbyte,               make_function_1_type(type_unsigned_char, type_unsigned_short));
+       MS_BUILTIN(__inword,               make_function_1_type(type_unsigned_short, type_unsigned_short));
+       MS_BUILTIN(__indword,              make_function_1_type(type_unsigned_long, type_unsigned_short));
+       MS_BUILTIN(__outbyte,              make_function_2_type(type_void, type_unsigned_short, type_unsigned_char));
+       MS_BUILTIN(__outword,              make_function_2_type(type_void, type_unsigned_short, type_unsigned_short));
+       MS_BUILTIN(__outdword,             make_function_2_type(type_void, type_unsigned_short, type_unsigned_long));
+       MS_BUILTIN(__ud2,                  make_function_0_type_noreturn(type_void));
+       MS_BUILTIN(_BitScanForward,        make_function_2_type(type_unsigned_char, type_unsigned_long_ptr, type_unsigned_long));
+       MS_BUILTIN(_BitScanReverse,        make_function_2_type(type_unsigned_char, type_unsigned_long_ptr, type_unsigned_long));
+       MS_BUILTIN(_InterlockedExchange,   make_function_2_type(type_long, type_long_ptr, type_long));
+       MS_BUILTIN(_InterlockedExchange64, make_function_2_type(type_int64, type_int64_ptr, type_int64));
+
+       if (machine_size <= 32) {
+               MS_BUILTIN(__readeflags,           make_function_0_type(type_unsigned_int));
+               MS_BUILTIN(__writeeflags,          make_function_1_type(type_void, type_unsigned_int));
+       } else {
+               MS_BUILTIN(__readeflags,           make_function_0_type(type_unsigned_int64));
+               MS_BUILTIN(__writeeflags,          make_function_1_type(type_void, type_unsigned_int64));
+       }
+
+#undef MS_BUILTIN
+}
+
 /**
  * Initialize the parser.
  */
@@ -11353,24 +11496,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));