we might also have array null-initializers; do NOT do anythign for union members
[cparser] / ast2firm.c
index e41150c..a205b27 100644 (file)
@@ -648,9 +648,9 @@ static ir_type *create_enum_type(enum_type_t *const type)
 {
        type->base.firm_type = ir_type_int;
 
-       ir_mode *const mode    = mode_int;
-       tarval  *const one     = get_mode_one(mode);
-       tarval  *      tv_next = get_mode_null(mode);
+       ir_mode   *const mode    = mode_int;
+       ir_tarval *const one     = get_mode_one(mode);
+       ir_tarval *      tv_next = get_mode_null(mode);
 
        bool constant_folding_old = constant_folding;
        constant_folding = true;
@@ -877,7 +877,12 @@ static const struct {
 
 static ident *rts_idents[lengthof(rts_data)];
 
-static ident* (*create_ld_ident)(entity_t*) = create_name_linux_elf;
+static create_ld_ident_func create_ld_ident = create_name_linux_elf;
+
+void set_create_ld_ident(ident *(*func)(entity_t*))
+{
+       create_ld_ident = func;
+}
 
 /**
  * Handle GNU attributes for entities
@@ -892,10 +897,10 @@ static void handle_decl_modifiers(ir_entity *irentity, entity_t *entity)
 
        if (is_method_entity(irentity)) {
                if (modifiers & DM_PURE) {
-                       set_entity_additional_property(irentity, mtp_property_pure);
+                       set_entity_additional_properties(irentity, mtp_property_pure);
                }
                if (modifiers & DM_CONST) {
-                       set_entity_additional_property(irentity, mtp_property_const);
+                       add_entity_additional_properties(irentity, mtp_property_const);
                        have_const_functions = true;
                }
        }
@@ -1015,12 +1020,12 @@ static ir_entity *get_function_entity(entity_t *entity, ir_type *owner_type)
                }
        } else {
                /* nested functions are always local */
-               set_entity_visibility(irentity, ir_visibility_local);
+               set_entity_visibility(irentity, ir_visibility_local);
        }
 
        /* We should check for file scope here, but as long as we compile C only
           this is not needed. */
-       if (! firm_opt.freestanding && !has_body) {
+       if (!freestanding && !has_body) {
                /* check for a known runtime function */
                for (size_t i = 0; i < lengthof(rts_data); ++i) {
                        if (id != rts_idents[i])
@@ -1123,8 +1128,8 @@ static ir_node *wide_string_literal_to_firm(
        const char              *p    = literal->value.begin;
        for (size_t i = 0; i < slen; ++i) {
                assert(p < literal->value.begin + literal->value.size);
-               utf32              v  = read_utf8_char(&p);
-               tarval           *tv  = new_tarval_from_long(v, mode);
+               utf32               = read_utf8_char(&p);
+               ir_tarval        *tv  = new_tarval_from_long(v, mode);
                ir_initializer_t *val = create_initializer_tarval(tv);
                set_initializer_compound_value(initializer, i, val);
        }
@@ -1167,7 +1172,7 @@ static ir_node *string_to_firm(const source_position_t *const src_pos,
 
        ir_initializer_t *initializer = create_initializer_compound(slen);
        for (size_t i = 0; i < slen; ++i) {
-               tarval           *tv  = new_tarval_from_long(string[i], mode);
+               ir_tarval        *tv  = new_tarval_from_long(string[i], mode);
                ir_initializer_t *val = create_initializer_tarval(tv);
                set_initializer_compound_value(initializer, i, val);
        }
@@ -1185,8 +1190,8 @@ static bool try_create_integer(literal_expression_t *literal,
        assert(type->kind == TYPE_ATOMIC);
        atomic_type_kind_t akind = type->atomic.akind;
 
-       ir_mode *mode = atomic_modes[akind];
-       tarval  *tv   = new_integer_tarval_from_str(string, size, 1, base, mode);
+       ir_mode   *mode = atomic_modes[akind];
+       ir_tarval *tv   = new_integer_tarval_from_str(string, size, 1, base, mode);
        if (tv == tarval_bad)
                return false;
 
@@ -1273,7 +1278,7 @@ static ir_node *literal_to_firm(const literal_expression_t *literal)
        ir_mode    *mode   = get_ir_mode_storage(type);
        const char *string = literal->value.begin;
        size_t      size   = literal->value.size;
-       tarval     *tv;
+       ir_tarval  *tv;
 
        switch (literal->base.kind) {
        case EXPR_LITERAL_WIDE_CHARACTER: {
@@ -1789,21 +1794,21 @@ static ir_node *process_builtin_call(const call_expression_t *call)
        case bk_gnu_builtin_inf:
        case bk_gnu_builtin_inff:
        case bk_gnu_builtin_infl: {
-               type_t  *type = function_type->function.return_type;
-               ir_mode *mode = get_ir_mode_arithmetic(type);
-               tarval  *tv   = get_mode_infinite(mode);
-               ir_node *res  = new_d_Const(dbgi, tv);
-               return   res;
+               type_t    *type = function_type->function.return_type;
+               ir_mode   *mode = get_ir_mode_arithmetic(type);
+               ir_tarval *tv   = get_mode_infinite(mode);
+               ir_node   *res  = new_d_Const(dbgi, tv);
+               return res;
        }
        case bk_gnu_builtin_nan:
        case bk_gnu_builtin_nanf:
        case bk_gnu_builtin_nanl: {
                /* Ignore string for now... */
                assert(is_type_function(function_type));
-               type_t  *type = function_type->function.return_type;
-               ir_mode *mode = get_ir_mode_arithmetic(type);
-               tarval  *tv   = get_mode_NAN(mode);
-               ir_node *res  = new_d_Const(dbgi, tv);
+               type_t    *type = function_type->function.return_type;
+               ir_mode   *mode = get_ir_mode_arithmetic(type);
+               ir_tarval *tv   = get_mode_NAN(mode);
+               ir_node   *res  = new_d_Const(dbgi, tv);
                return res;
        }
        case bk_gnu_builtin_expect: {
@@ -1879,6 +1884,22 @@ static ir_node *process_builtin_call(const call_expression_t *call)
                set_store(new_Proj(irn, mode_M, pn_Builtin_M));
                return NULL;
        }
+       case bk_gnu_builtin_object_size: {
+               /* determine value of "type" */
+               expression_t *type_expression = call->arguments->next->expression;
+               long          type_val        = fold_constant_to_int(type_expression);
+               type_t       *type            = function_type->function.return_type;
+               ir_mode      *mode            = get_ir_mode_arithmetic(type);
+               ir_tarval    *result;
+
+               /* just produce a "I don't know" result */
+               if (type_val & 2)
+                       result = new_tarval_from_long(0, mode);
+               else
+                       result = new_tarval_from_long(-1, mode);
+
+               return new_d_Const(dbgi, result);
+       }
        case bk_gnu_builtin_trap:
        case bk_ms__ud2:
        {
@@ -2116,10 +2137,10 @@ static void assign_value(dbg_info *dbgi, ir_node *addr, type_t *type,
        }
 }
 
-static tarval *create_bitfield_mask(ir_mode *mode, int offset, int size)
+static ir_tarval *create_bitfield_mask(ir_mode *mode, int offset, int size)
 {
-       tarval *all_one   = get_mode_all_one(mode);
-       int     mode_size = get_mode_size_bits(mode);
+       ir_tarval *all_one   = get_mode_all_one(mode);
+       int        mode_size = get_mode_size_bits(mode);
 
        assert(offset >= 0);
        assert(size   >= 0);
@@ -2128,12 +2149,12 @@ static tarval *create_bitfield_mask(ir_mode *mode, int offset, int size)
                return all_one;
        }
 
-       long    shiftr    = get_mode_size_bits(mode) - size;
-       long    shiftl    = offset;
-       tarval *tv_shiftr = new_tarval_from_long(shiftr, mode_uint);
-       tarval *tv_shiftl = new_tarval_from_long(shiftl, mode_uint);
-       tarval *mask0     = tarval_shr(all_one, tv_shiftr);
-       tarval *mask1     = tarval_shl(mask0, tv_shiftl);
+       long       shiftr    = get_mode_size_bits(mode) - size;
+       long       shiftl    = offset;
+       ir_tarval *tv_shiftr = new_tarval_from_long(shiftr, mode_uint);
+       ir_tarval *tv_shiftl = new_tarval_from_long(shiftl, mode_uint);
+       ir_tarval *mask0     = tarval_shr(all_one, tv_shiftr);
+       ir_tarval *mask1     = tarval_shl(mask0, tv_shiftl);
 
        return mask1;
 }
@@ -2152,23 +2173,23 @@ static ir_node *bitfield_store_to_firm(dbg_info *dbgi,
        int      bitoffset    = get_entity_offset_bits_remainder(entity);
        int      bitsize      = get_mode_size_bits(get_type_mode(entity_type));
 
-       tarval  *mask            = create_bitfield_mask(mode, 0, bitsize);
-       ir_node *mask_node       = new_d_Const(dbgi, mask);
-       ir_node *value_masked    = new_d_And(dbgi, value, mask_node, mode);
-       tarval  *shiftl          = new_tarval_from_long(bitoffset, mode_uint);
-       ir_node *shiftcount      = new_d_Const(dbgi, shiftl);
-       ir_node *value_maskshift = new_d_Shl(dbgi, value_masked, shiftcount, mode);
+       ir_tarval *mask            = create_bitfield_mask(mode, 0, bitsize);
+       ir_node   *mask_node       = new_d_Const(dbgi, mask);
+       ir_node   *value_masked    = new_d_And(dbgi, value, mask_node, mode);
+       ir_tarval *shiftl          = new_tarval_from_long(bitoffset, mode_uint);
+       ir_node   *shiftcount      = new_d_Const(dbgi, shiftl);
+       ir_node   *value_maskshift = new_d_Shl(dbgi, value_masked, shiftcount, mode);
 
        /* load current value */
-       ir_node  *mem             = get_store();
-       ir_node  *load            = new_d_Load(dbgi, mem, addr, mode,
-                                       set_volatile ? cons_volatile : cons_none);
-       ir_node  *load_mem        = new_d_Proj(dbgi, load, mode_M, pn_Load_M);
-       ir_node  *load_res        = new_d_Proj(dbgi, load, mode, pn_Load_res);
-       tarval   *shift_mask      = create_bitfield_mask(mode, bitoffset, bitsize);
-       tarval   *inv_mask        = tarval_not(shift_mask);
-       ir_node  *inv_mask_node   = new_d_Const(dbgi, inv_mask);
-       ir_node  *load_res_masked = new_d_And(dbgi, load_res, inv_mask_node, mode);
+       ir_node   *mem             = get_store();
+       ir_node   *load            = new_d_Load(dbgi, mem, addr, mode,
+                                         set_volatile ? cons_volatile : cons_none);
+       ir_node   *load_mem        = new_d_Proj(dbgi, load, mode_M, pn_Load_M);
+       ir_node   *load_res        = new_d_Proj(dbgi, load, mode, pn_Load_res);
+       ir_tarval *shift_mask      = create_bitfield_mask(mode, bitoffset, bitsize);
+       ir_tarval *inv_mask        = tarval_not(shift_mask);
+       ir_node   *inv_mask_node   = new_d_Const(dbgi, inv_mask);
+       ir_node   *load_res_masked = new_d_And(dbgi, load_res, inv_mask_node, mode);
 
        /* construct new value and store */
        ir_node *new_val   = new_d_Or(dbgi, load_res_masked, value_maskshift, mode);
@@ -2203,13 +2224,13 @@ static ir_node *bitfield_extract_to_firm(const select_expression_t *expression,
        int        bitsize      = get_mode_size_bits(get_type_mode(entity_type));
        long       shift_bitsl  = machine_size - bitoffset - bitsize;
        assert(shift_bitsl >= 0);
-       tarval    *tvl          = new_tarval_from_long(shift_bitsl, mode_uint);
+       ir_tarval *tvl          = new_tarval_from_long(shift_bitsl, mode_uint);
        ir_node   *countl       = new_d_Const(dbgi, tvl);
        ir_node   *shiftl       = new_d_Shl(dbgi, load_res, countl, mode_int);
 
        long       shift_bitsr  = bitoffset + shift_bitsl;
        assert(shift_bitsr <= (long) machine_size);
-       tarval    *tvr          = new_tarval_from_long(shift_bitsr, mode_uint);
+       ir_tarval *tvr          = new_tarval_from_long(shift_bitsr, mode_uint);
        ir_node   *countr       = new_d_Const(dbgi, tvr);
        ir_node   *shiftr;
        if (mode_is_signed(mode)) {
@@ -2439,7 +2460,7 @@ static ir_node *handle_assume_compare(dbg_info *dbi,
        cmp_val = get_pnc(expression->base.kind, op1->base.type);
 
        if (is_local_variable(op1) && is_local_variable(op2)) {
-       var  = op1->reference.entity;
+               var  = op1->reference.entity;
            var2 = op2->reference.entity;
 
                type_t  *const type = skip_typeref(var->declaration.type);
@@ -2599,10 +2620,7 @@ static ir_node *unary_expression_to_firm(const unary_expression_t *expression)
                return create_cast(dbgi, value_node, from_type, type);
        }
        case EXPR_UNARY_ASSUME:
-               if (firm_opt.confirm)
-                       return handle_assume(dbgi, value);
-               else
-                       return NULL;
+               return handle_assume(dbgi, value);
 
        default:
                break;
@@ -2985,10 +3003,10 @@ static long get_offsetof_offset(const offsetof_expression_t *expression)
 
 static ir_node *offsetof_to_firm(const offsetof_expression_t *expression)
 {
-       ir_mode  *mode   = get_ir_mode_arithmetic(expression->base.type);
-       long      offset = get_offsetof_offset(expression);
-       tarval   *tv     = new_tarval_from_long(offset, mode);
-       dbg_info *dbgi   = get_dbg_info(&expression->base.source_position);
+       ir_mode   *mode   = get_ir_mode_arithmetic(expression->base.type);
+       long       offset = get_offsetof_offset(expression);
+       ir_tarval *tv     = new_tarval_from_long(offset, mode);
+       dbg_info  *dbgi   = get_dbg_info(&expression->base.source_position);
 
        return new_d_Const(dbgi, tv);
 }
@@ -3079,15 +3097,15 @@ static ir_node *alignof_to_firm(const typeprop_expression_t *expression)
                alignment = get_type_alignment(type);
        }
 
-       dbg_info *dbgi = get_dbg_info(&expression->base.source_position);
-       ir_mode  *mode = get_ir_mode_arithmetic(expression->base.type);
-       tarval   *tv   = new_tarval_from_long(alignment, mode);
+       dbg_info  *dbgi = get_dbg_info(&expression->base.source_position);
+       ir_mode   *mode = get_ir_mode_arithmetic(expression->base.type);
+       ir_tarval *tv   = new_tarval_from_long(alignment, mode);
        return new_d_Const(dbgi, tv);
 }
 
 static void init_ir_types(void);
 
-static tarval *fold_constant_to_tarval(const expression_t *expression)
+static ir_tarval *fold_constant_to_tarval(const expression_t *expression)
 {
        assert(is_type_valid(skip_typeref(expression->base.type)));
 
@@ -3110,8 +3128,7 @@ static tarval *fold_constant_to_tarval(const expression_t *expression)
 
        constant_folding = constant_folding_old;
 
-       tarval *tv = get_Const_tarval(cnst);
-       return tv;
+       return get_Const_tarval(cnst);
 }
 
 long fold_constant_to_int(const expression_t *expression)
@@ -3119,7 +3136,7 @@ long fold_constant_to_int(const expression_t *expression)
        if (expression->kind == EXPR_INVALID)
                return 0;
 
-       tarval *tv = fold_constant_to_tarval(expression);
+       ir_tarval *tv = fold_constant_to_tarval(expression);
        if (!tarval_is_long(tv)) {
                panic("result of constant folding is not integer");
        }
@@ -3131,7 +3148,7 @@ bool fold_constant_to_bool(const expression_t *expression)
 {
        if (expression->kind == EXPR_INVALID)
                return false;
-       tarval *tv = fold_constant_to_tarval(expression);
+       ir_tarval *tv = fold_constant_to_tarval(expression);
        return !tarval_is_null(tv);
 }
 
@@ -3347,8 +3364,8 @@ static ir_node *classify_type_to_firm(const classify_type_expression_t *const ex
        }
 
 make_const:;
-       dbg_info *const dbgi = get_dbg_info(&expr->base.source_position);
-       tarval   *const tv   = new_tarval_from_long(tc, mode_int);
+       dbg_info  *const dbgi = get_dbg_info(&expr->base.source_position);
+       ir_tarval *const tv   = new_tarval_from_long(tc, mode_int);
        return new_d_Const(dbgi, tv);
 }
 
@@ -4169,7 +4186,7 @@ static ir_initializer_t *create_ir_initializer_string(
                if (i < string_len)
                        c = string[i];
 
-               tarval           *tv = new_tarval_from_long(c, mode);
+               ir_tarval        *tv = new_tarval_from_long(c, mode);
                ir_initializer_t *char_initializer = create_initializer_tarval(tv);
 
                set_initializer_compound_value(irinitializer, i, char_initializer);
@@ -4195,7 +4212,7 @@ static ir_initializer_t *create_ir_initializer_wide_string(
                if (i < string_len) {
                        c = read_utf8_char(&p);
                }
-               tarval *tv = new_tarval_from_long(c, mode);
+               ir_tarval *tv = new_tarval_from_long(c, mode);
                ir_initializer_t *char_initializer = create_initializer_tarval(tv);
 
                set_initializer_compound_value(irinitializer, i, char_initializer);
@@ -4227,14 +4244,68 @@ static ir_initializer_t *create_ir_initializer(
        panic("unknown initializer");
 }
 
+/** ANSI C ยง6.7.8:21: If there are fewer initializers [..] than there
+ *  are elements [...] the remainder of the aggregate shall be initialized
+ *  implicitly the same as objects that have static storage duration. */
+static void create_dynamic_null_initializer(ir_entity *entity, dbg_info *dbgi,
+               ir_node *base_addr)
+{
+       /* for unions we must NOT do anything for null initializers */
+       ir_type *owner = get_entity_owner(entity);
+       if (is_Union_type(owner)) {
+               return;
+       }
+
+       ir_type *ent_type = get_entity_type(entity);
+       /* create sub-initializers for a compound type */
+       if (is_compound_type(ent_type)) {
+               unsigned n_members = get_compound_n_members(ent_type);
+               for (unsigned n = 0; n < n_members; ++n) {
+                       ir_entity *member = get_compound_member(ent_type, n);
+                       ir_node   *addr   = new_d_simpleSel(dbgi, new_NoMem(), base_addr,
+                                                               member);
+                       create_dynamic_null_initializer(member, dbgi, addr);
+               }
+               return;
+       }
+       if (is_Array_type(ent_type)) {
+               assert(has_array_upper_bound(ent_type, 0));
+               long n = get_array_upper_bound_int(ent_type, 0);
+               for (long i = 0; i < n; ++i) {
+                       ir_tarval *index_tv = new_tarval_from_long(i, mode_uint);
+                       ir_node   *cnst     = new_d_Const(dbgi, index_tv);
+                       ir_node   *in[1]    = { cnst };
+                       ir_entity *arrent   = get_array_element_entity(ent_type);
+                       ir_node   *addr     = new_d_Sel(dbgi, new_NoMem(), base_addr, 1, in,
+                                                       arrent);
+                       create_dynamic_null_initializer(arrent, dbgi, addr);
+               }
+               return;
+       }
+
+       ir_mode *value_mode = get_type_mode(ent_type);
+       ir_node *node = new_Const_long(value_mode, 0);
+
+       /* is it a bitfield type? */
+       if (is_Primitive_type(ent_type) &&
+                       get_primitive_base_type(ent_type) != NULL) {
+               bitfield_store_to_firm(dbgi, entity, base_addr, node, false);
+               return;
+       }
+
+       ir_node *mem    = get_store();
+       ir_node *store  = new_d_Store(dbgi, mem, base_addr, node, cons_none);
+       ir_node *proj_m = new_Proj(store, mode_M, pn_Store_M);
+       set_store(proj_m);
+}
+
 static void create_dynamic_initializer_sub(ir_initializer_t *initializer,
                ir_entity *entity, ir_type *type, dbg_info *dbgi, ir_node *base_addr)
 {
        switch(get_initializer_kind(initializer)) {
-       case IR_INITIALIZER_NULL: {
-               /* NULL is undefined for dynamic initializers */
+       case IR_INITIALIZER_NULL:
+               create_dynamic_null_initializer(entity, dbgi, base_addr);
                return;
-       }
        case IR_INITIALIZER_CONST: {
                ir_node *node     = get_initializer_const_value(initializer);
                ir_type *ent_type = get_entity_type(entity);
@@ -4254,9 +4325,9 @@ static void create_dynamic_initializer_sub(ir_initializer_t *initializer,
                return;
        }
        case IR_INITIALIZER_TARVAL: {
-               tarval  *tv       = get_initializer_tarval_value(initializer);
-               ir_node *cnst     = new_d_Const(dbgi, tv);
-               ir_type *ent_type = get_entity_type(entity);
+               ir_tarval *tv       = get_initializer_tarval_value(initializer);
+               ir_node   *cnst     = new_d_Const(dbgi, tv);
+               ir_type   *ent_type = get_entity_type(entity);
 
                /* is it a bitfield type? */
                if (is_Primitive_type(ent_type) &&
@@ -4291,7 +4362,7 @@ static void create_dynamic_initializer_sub(ir_initializer_t *initializer,
                        ir_type   *irtype;
                        ir_entity *sub_entity;
                        if (is_Array_type(type)) {
-                               tarval    *index_tv = new_tarval_from_long(i, mode_uint);
+                               ir_tarval *index_tv = new_tarval_from_long(i, mode_uint);
                                ir_node   *cnst     = new_d_Const(dbgi, index_tv);
                                ir_node   *in[1]    = { cnst };
                                irtype     = get_array_element_type(type);
@@ -4648,7 +4719,7 @@ static ir_node *compound_statement_to_firm(compound_statement_t *compound)
 
 static void create_global_variable(entity_t *entity)
 {
-       ir_linkage    linkage    = 0;
+       ir_linkage    linkage    = IR_LINKAGE_DEFAULT;
        ir_visibility visibility = ir_visibility_default;
        ir_entity    *irentity;
        assert(entity->kind == ENTITY_VARIABLE);
@@ -5104,8 +5175,8 @@ static void switch_statement_to_firm(switch_statement_t *statement)
        current_switch                       = statement;
 
        /* determine a free number for the default label */
-       unsigned long num_cases = 0;
-       long def_nr = 0;
+       unsigned long num_cases       = 0;
+       long          default_proj_nr = 0;
        for (case_label_statement_t *l = statement->first_case; l != NULL; l = l->next) {
                if (l->expression == NULL) {
                        /* default case */
@@ -5113,18 +5184,18 @@ static void switch_statement_to_firm(switch_statement_t *statement)
                }
                if (l->last_case >= l->first_case)
                        num_cases += l->last_case - l->first_case + 1;
-               if (l->last_case > def_nr)
-                       def_nr = l->last_case;
+               if (l->last_case > default_proj_nr)
+                       default_proj_nr = l->last_case;
        }
 
-       if (def_nr == INT_MAX) {
+       if (default_proj_nr == INT_MAX) {
                /* Bad: an overflow will occur, we cannot be sure that the
                 * maximum + 1 is a free number. Scan the values a second
                 * time to find a free number.
                 */
                unsigned char *bits = xmalloc((num_cases + 7) >> 3);
 
-               memset(bits, 0, (num_cases + 7) >> 3);
+               memset(bits, 0, (num_cases + 7) >> 3);
                for (case_label_statement_t *l = statement->first_case; l != NULL; l = l->next) {
                        if (l->expression == NULL) {
                                /* default case */
@@ -5150,11 +5221,15 @@ static void switch_statement_to_firm(switch_statement_t *statement)
                                break;
 
                free(bits);
-               def_nr = i;
+               default_proj_nr = i;
        } else {
-               ++def_nr;
+               ++default_proj_nr;
+       }
+       statement->default_proj_nr = default_proj_nr;
+       /* safety check: cond might already be folded to a Bad */
+       if (cond != NULL && is_Cond(cond)) {
+               set_Cond_default_proj(cond, default_proj_nr);
        }
-       statement->default_proj_nr = def_nr;
 
        if (statement->body != NULL) {
                statement_to_firm(statement->body);
@@ -5167,8 +5242,7 @@ static void switch_statement_to_firm(switch_statement_t *statement)
 
        if (!saw_default_label && first_block != NULL) {
                set_cur_block(first_block);
-               ir_node *const proj = new_d_defaultProj(dbgi, cond,
-                                                       statement->default_proj_nr);
+               ir_node *const proj = new_d_Proj(dbgi, cond, mode_X, default_proj_nr);
                add_immBlock_pred(get_break_label(), proj);
        }
 
@@ -5209,8 +5283,8 @@ static void case_label_to_firm(const case_label_statement_t *statement)
                        } while (pn++ < end_pn);
                } else {
                        saw_default_label = true;
-                       proj = new_d_defaultProj(dbgi, current_switch_cond,
-                                                                        current_switch->default_proj_nr);
+                       proj = new_d_Proj(dbgi, current_switch_cond, mode_X,
+                                         current_switch->default_proj_nr);
 
                        add_immBlock_pred(block, proj);
                }
@@ -5726,22 +5800,22 @@ static void handle_decl_modifier_irg(ir_graph_ptr irg,
 {
        if (decl_modifiers & DM_RETURNS_TWICE) {
                /* TRUE if the declaration includes __attribute__((returns_twice)) */
-               set_irg_additional_property(irg, mtp_property_returns_twice);
+               add_irg_additional_properties(irg, mtp_property_returns_twice);
        }
        if (decl_modifiers & DM_NORETURN) {
                /* TRUE if the declaration includes the Microsoft
                   __declspec(noreturn) specifier. */
-               set_irg_additional_property(irg, mtp_property_noreturn);
+               add_irg_additional_properties(irg, mtp_property_noreturn);
        }
        if (decl_modifiers & DM_NOTHROW) {
                /* TRUE if the declaration includes the Microsoft
                   __declspec(nothrow) specifier. */
-               set_irg_additional_property(irg, mtp_property_nothrow);
+               add_irg_additional_properties(irg, mtp_property_nothrow);
        }
        if (decl_modifiers & DM_NAKED) {
                /* TRUE if the declaration includes the Microsoft
                   __declspec(naked) specifier. */
-               set_irg_additional_property(irg, mtp_property_naked);
+               add_irg_additional_properties(irg, mtp_property_naked);
        }
        if (decl_modifiers & DM_FORCEINLINE) {
                /* TRUE if the declaration includes the
@@ -5769,7 +5843,7 @@ static void add_function_pointer(ir_type *segment, ir_entity *method,
        ir_entity *ptr          = new_entity(segment, ide, ptr_type);
        ir_graph  *irg          = get_const_code_irg();
        ir_node   *val          = new_rd_SymConst_addr_ent(NULL, irg, mode_P_code,
-                                                          method, NULL);
+                                                          method);
 
        set_entity_ld_ident(ptr, new_id_from_chars("", 0));
        set_entity_compiler_generated(ptr, 1);
@@ -5802,7 +5876,7 @@ static void create_function(entity_t *entity)
        if (entity->function.statement == NULL)
                return;
 
-       if (is_main(entity) && firm_opt.os_support == OS_SUPPORT_MINGW) {
+       if (is_main(entity) && enable_main_collect2_hack) {
                prepare_main_collect2(entity);
        }
 
@@ -5828,13 +5902,15 @@ static void create_function(entity_t *entity)
 
        int       n_local_vars = get_function_n_local_vars(entity);
        ir_graph *irg          = new_ir_graph(function_entity, n_local_vars);
+       current_ir_graph = irg;
 
        ir_graph *old_current_function = current_function;
        current_function = irg;
 
        set_irg_fp_model(irg, firm_opt.fp_model);
        tarval_enable_fp_ops(1);
-       set_irn_dbg_info(get_irg_start_block(irg), get_entity_dbg_info(function_entity));
+       set_irn_dbg_info(get_irg_start_block(irg),
+                        get_entity_dbg_info(function_entity));
 
        ir_node *first_block = get_cur_block();
 
@@ -6010,21 +6086,6 @@ void init_ast2firm(void)
        ir_set_debug_retrieve(dbg_retrieve);
        ir_set_type_debug_retrieve(dbg_print_type_dbg_info);
 
-       /* OS option must be set to the backend */
-       switch (firm_opt.os_support) {
-       case OS_SUPPORT_MINGW:
-               create_ld_ident = create_name_win32;
-               break;
-       case OS_SUPPORT_LINUX:
-               create_ld_ident = create_name_linux_elf;
-               break;
-       case OS_SUPPORT_MACHO:
-               create_ld_ident = create_name_macho;
-               break;
-       default:
-               panic("unexpected OS support mode");
-       }
-
        /* create idents for all known runtime functions */
        for (size_t i = 0; i < lengthof(rts_data); ++i) {
                rts_idents[i] = new_id_from_str(rts_data[i].name);