modularize revision file updating and include cparser
[cparser] / ast2firm.c
index a13d69d..2fbe089 100644 (file)
@@ -46,6 +46,7 @@
 #include "mangle.h"
 #include "walk_statements.h"
 #include "warning.h"
+#include "printer.h"
 #include "entitymap_t.h"
 #include "driver/firm_opt.h"
 #include "driver/firm_cmdline.h"
@@ -141,16 +142,7 @@ ir_node *uninitialized_local_var(ir_graph *irg, ir_mode *mode, int pos)
        return new_r_Unknown(irg, mode);
 }
 
-unsigned dbg_snprint(char *buf, unsigned len, const dbg_info *dbg)
-{
-       const source_position_t *pos = (const source_position_t*) dbg;
-       if (pos == NULL)
-               return 0;
-       return (unsigned) snprintf(buf, len, "%s:%u", pos->input_name,
-                                  pos->linenr);
-}
-
-const char *dbg_retrieve(const dbg_info *dbg, unsigned *line)
+static const char *dbg_retrieve(const dbg_info *dbg, unsigned *line)
 {
        const source_position_t *pos = (const source_position_t*) dbg;
        if (pos == NULL)
@@ -165,6 +157,21 @@ static dbg_info *get_dbg_info(const source_position_t *pos)
        return (dbg_info*) pos;
 }
 
+static void dbg_print_type_dbg_info(char *buffer, size_t buffer_size,
+                                    const type_dbg_info *dbg)
+{
+       assert(dbg != NULL);
+       print_to_buffer(buffer, buffer_size);
+       const type_t *type = (const type_t*) dbg;
+       print_type(type);
+       finish_print_to_buffer();
+}
+
+static type_dbg_info *get_type_dbg_info_(const type_t *type)
+{
+       return (type_dbg_info*) type;
+}
+
 static ir_mode *atomic_modes[ATOMIC_TYPE_LAST+1];
 
 static ir_mode *mode_int, *mode_uint;
@@ -294,11 +301,11 @@ static unsigned count_parameters(const function_type_t *function_type)
 /**
  * Creates a Firm type for an atomic type
  */
-static ir_type *create_atomic_type(atomic_type_kind_t akind)
+static ir_type *create_atomic_type(atomic_type_kind_t akind, const type_t *type)
 {
        ir_mode        *mode      = atomic_modes[akind];
-       ident          *id        = get_mode_ident(mode);
-       ir_type        *irtype    = new_type_primitive(id, mode);
+       type_dbg_info  *dbgi      = get_type_dbg_info_(type);
+       ir_type        *irtype    = new_d_type_primitive(mode, dbgi);
        il_alignment_t  alignment = get_atomic_type_alignment(akind);
 
        set_type_alignment_bytes(irtype, alignment);
@@ -326,15 +333,7 @@ static ir_type *create_complex_type(const complex_type_t *type)
  */
 static ir_type *create_imaginary_type(imaginary_type_t *type)
 {
-       atomic_type_kind_t  kind      = type->akind;
-       ir_mode            *mode      = atomic_modes[kind];
-       ident              *id        = get_mode_ident(mode);
-       ir_type            *irtype    = new_type_primitive(id, mode);
-       il_alignment_t      alignment = get_type_alignment((type_t*) type);
-
-       set_type_alignment_bytes(irtype, alignment);
-
-       return irtype;
+       return create_atomic_type(type->akind, (const type_t*) type);
 }
 
 /**
@@ -355,12 +354,13 @@ static type_t *get_parameter_type(type_t *orig_type)
 
 static ir_type *create_method_type(const function_type_t *function_type, bool for_closure)
 {
-       type_t  *return_type  = skip_typeref(function_type->return_type);
+       type_t        *return_type  = skip_typeref(function_type->return_type);
 
-       ident   *id           = id_unique("functiontype.%u");
-       int      n_parameters = count_parameters(function_type) + (for_closure ? 1 : 0);
-       int      n_results    = return_type == type_void ? 0 : 1;
-       ir_type *irtype       = new_type_method(id, n_parameters, n_results);
+       int            n_parameters = count_parameters(function_type)
+                                      + (for_closure ? 1 : 0);
+       int            n_results    = return_type == type_void ? 0 : 1;
+       type_dbg_info *dbgi         = get_type_dbg_info_((const type_t*) function_type);
+       ir_type       *irtype       = new_d_type_method(n_parameters, n_results, dbgi);
 
        if (return_type != type_void) {
                ir_type *restype = get_ir_type(return_type);
@@ -422,31 +422,30 @@ is_cdecl:
 
 static ir_type *create_pointer_type(pointer_type_t *type)
 {
-       type_t   *points_to    = type->points_to;
-       ir_type  *ir_points_to = get_ir_type_incomplete(points_to);
-       ir_type  *ir_type      = new_type_pointer(id_unique("pointer.%u"),
-                                                 ir_points_to, mode_P_data);
+       type_dbg_info *dbgi         = get_type_dbg_info_((const type_t*) type);
+       type_t        *points_to    = type->points_to;
+       ir_type       *ir_points_to = get_ir_type_incomplete(points_to);
+       ir_type       *ir_type      = new_d_type_pointer(ir_points_to, dbgi);
 
        return ir_type;
 }
 
 static ir_type *create_reference_type(reference_type_t *type)
 {
-       type_t  *refers_to    = type->refers_to;
-       ir_type *ir_refers_to = get_ir_type_incomplete(refers_to);
-       ir_type *ir_type      = new_type_pointer(id_unique("reference.%u"),
-                                                ir_refers_to, mode_P_data);
+       type_dbg_info *dbgi         = get_type_dbg_info_((const type_t*) type);
+       type_t        *refers_to    = type->refers_to;
+       ir_type       *ir_refers_to = get_ir_type_incomplete(refers_to);
+       ir_type       *ir_type      = new_d_type_pointer(ir_refers_to, dbgi);
 
        return ir_type;
 }
 
 static ir_type *create_array_type(array_type_t *type)
 {
-       type_t  *element_type    = type->element_type;
-       ir_type *ir_element_type = get_ir_type(element_type);
-
-       ident    *id      = id_unique("array.%u");
-       ir_type  *ir_type = new_type_array(id, 1, ir_element_type);
+       type_dbg_info *dbgi            = get_type_dbg_info_((const type_t*) type);
+       type_t        *element_type    = type->element_type;
+       ir_type       *ir_element_type = get_ir_type(element_type);
+       ir_type       *ir_type         = new_d_type_array(1, ir_element_type, dbgi);
 
        const int align = get_type_alignment_bytes(ir_element_type);
        set_type_alignment_bytes(ir_type, align);
@@ -475,7 +474,8 @@ static ir_type *create_array_type(array_type_t *type)
  * @param size   the size
  */
 static ir_type *get_signed_int_type_for_bit_size(ir_type *base_tp,
-                                                 unsigned size)
+                                                 unsigned size,
+                                                                                                const type_t *type)
 {
        static ir_mode *s_modes[64 + 1] = {NULL, };
        ir_type *res;
@@ -494,11 +494,8 @@ static ir_type *get_signed_int_type_for_bit_size(ir_type *base_tp,
                s_modes[size] = mode;
        }
 
-       char name[32];
-       snprintf(name, sizeof(name), "I%u", size);
-       ident *id = new_id_from_str(name);
-       dbg_info *dbgi = get_dbg_info(&builtin_source_position);
-       res = new_d_type_primitive(id_mangle_u(get_type_ident(base_tp), id), mode, dbgi);
+       type_dbg_info *dbgi = get_type_dbg_info_(type);
+       res                 = new_d_type_primitive(mode, dbgi);
        set_primitive_base_type(res, base_tp);
 
        return res;
@@ -510,7 +507,8 @@ static ir_type *get_signed_int_type_for_bit_size(ir_type *base_tp,
  * @param size   the size
  */
 static ir_type *get_unsigned_int_type_for_bit_size(ir_type *base_tp,
-                                                   unsigned size)
+                                                   unsigned size,
+                                                                                                  const type_t *type)
 {
        static ir_mode *u_modes[64 + 1] = {NULL, };
        ir_type *res;
@@ -529,12 +527,8 @@ static ir_type *get_unsigned_int_type_for_bit_size(ir_type *base_tp,
                u_modes[size] = mode;
        }
 
-       char name[32];
-
-       snprintf(name, sizeof(name), "U%u", size);
-       ident *id = new_id_from_str(name);
-       dbg_info *dbgi = get_dbg_info(&builtin_source_position);
-       res = new_d_type_primitive(id_mangle_u(get_type_ident(base_tp), id), mode, dbgi);
+       type_dbg_info *dbgi = get_type_dbg_info_(type);
+       res = new_d_type_primitive(mode, dbgi);
        set_primitive_base_type(res, base_tp);
 
        return res;
@@ -550,9 +544,11 @@ static ir_type *create_bitfield_type(bitfield_type_t *const type)
 
        assert(!is_type_float(base));
        if (is_type_signed(base)) {
-               return get_signed_int_type_for_bit_size(irbase, size);
+               return get_signed_int_type_for_bit_size(irbase, size,
+                                                       (const type_t*) type);
        } else {
-               return get_unsigned_int_type_for_bit_size(irbase, size);
+               return get_unsigned_int_type_for_bit_size(irbase, size,
+                                                         (const type_t*) type);
        }
 }
 
@@ -586,13 +582,12 @@ static ir_type *create_compound_type(compound_type_t *type,
                        id = id_unique("__anonymous_struct.%u");
                }
        }
-       dbg_info *dbgi = get_dbg_info(&compound->base.source_position);
 
        ir_type *irtype;
        if (is_union) {
-               irtype = new_d_type_union(id, dbgi);
+               irtype = new_type_union(id);
        } else {
-               irtype = new_d_type_struct(id, dbgi);
+               irtype = new_type_struct(id);
        }
 
        compound->irtype_complete = false;
@@ -680,7 +675,7 @@ static ir_type *create_enum_type(enum_type_t *const type)
 
        constant_folding = constant_folding_old;
 
-       return create_atomic_type(type->akind);
+       return create_atomic_type(type->akind, (const type_t*) type);
 }
 
 static ir_type *get_ir_type_incomplete(type_t *type)
@@ -718,10 +713,10 @@ ir_type *get_ir_type(type_t *type)
        switch (type->kind) {
        case TYPE_ERROR:
                /* Happens while constant folding, when there was an error */
-               return create_atomic_type(ATOMIC_TYPE_VOID);
+               return create_atomic_type(ATOMIC_TYPE_VOID, NULL);
 
        case TYPE_ATOMIC:
-               firm_type = create_atomic_type(type->atomic.akind);
+               firm_type = create_atomic_type(type->atomic.akind, type);
                break;
        case TYPE_COMPLEX:
                firm_type = create_complex_type(&type->complex);
@@ -894,19 +889,21 @@ static void handle_decl_modifiers(ir_entity *irentity, entity_t *entity)
 {
        assert(is_declaration(entity));
        decl_modifiers_t modifiers = entity->declaration.modifiers;
-       if (modifiers & DM_PURE) {
-               /* TRUE if the declaration includes the GNU
-                  __attribute__((pure)) specifier. */
-               set_entity_additional_property(irentity, mtp_property_pure);
-       }
-       if (modifiers & DM_CONST) {
-               set_entity_additional_property(irentity, mtp_property_const);
-               have_const_functions = true;
+
+       if (is_method_entity(irentity)) {
+               if (modifiers & DM_PURE) {
+                       set_entity_additional_property(irentity, mtp_property_pure);
+               }
+               if (modifiers & DM_CONST) {
+                       set_entity_additional_property(irentity, mtp_property_const);
+                       have_const_functions = true;
+               }
        }
        if (modifiers & DM_USED) {
-               /* TRUE if the declaration includes the GNU
-                  __attribute__((used)) specifier. */
-               set_entity_stickyness(irentity, stickyness_sticky);
+               add_entity_linkage(irentity, IR_LINKAGE_HIDDEN_USER);
+       }
+       if (modifiers & DM_WEAK) {
+               add_entity_linkage(irentity, IR_LINKAGE_WEAK);
        }
 }
 
@@ -960,9 +957,9 @@ static ir_entity *get_function_entity(entity_t *entity, ir_type *owner_type)
        ir_entity *irentity = entitymap_get(&entitymap, symbol);
        bool const has_body = entity->function.statement != NULL;
        if (irentity != NULL) {
-               if (get_entity_visibility(irentity) == visibility_external_allocated
+               if (get_entity_visibility(irentity) == ir_visibility_external
                                && has_body) {
-                       set_entity_visibility(irentity, visibility_external_visible);
+                       set_entity_visibility(irentity, ir_visibility_default);
                }
                goto entity_created;
        }
@@ -1001,24 +998,19 @@ static ir_entity *get_function_entity(entity_t *entity, ir_type *owner_type)
                bool                const is_inline     = entity->function.is_inline;
 
                if (is_inline && storage_class == STORAGE_CLASS_NONE && has_body) {
-                       set_entity_visibility(irentity, visibility_external_visible);
+                   set_entity_visibility(irentity, ir_visibility_default);
                } else if (storage_class == STORAGE_CLASS_STATIC ||
                           (is_inline && has_body)) {
-                       if (!has_body) {
-                               /* this entity was declared, but is defined nowhere */
-                               set_entity_peculiarity(irentity, peculiarity_description);
-                       }
-                       set_entity_visibility(irentity, visibility_local);
+                   set_entity_visibility(irentity, ir_visibility_local);
                } else if (has_body) {
-                       set_entity_visibility(irentity, visibility_external_visible);
+                   set_entity_visibility(irentity, ir_visibility_default);
                } else {
-                       set_entity_visibility(irentity, visibility_external_allocated);
+                   set_entity_visibility(irentity, ir_visibility_external);
                }
        } else {
                /* nested functions are always local */
-               set_entity_visibility(irentity, visibility_local);
+               set_entity_visibility(irentity, ir_visibility_local);
        }
-       set_entity_allocation(irentity, allocation_static);
 
        /* We should check for file scope here, but as long as we compile C only
           this is not needed. */
@@ -1137,17 +1129,17 @@ static ir_node *wide_character_constant_to_firm(const const_expression_t *cnst)
  * Allocate an area of size bytes aligned at alignment
  * at a frame type.
  */
-static ir_entity *alloc_trampoline(ir_type *frame_type, int size, unsigned alignment) {
+static ir_entity *alloc_trampoline(ir_type *frame_type, int size, unsigned alignment)
+{
        static unsigned area_cnt = 0;
        char buf[32];
 
-       snprintf(buf, sizeof(buf), "trampolin%u", area_cnt++);
-       ident *name = new_id_from_str(buf);
-
-       ir_type *tp = new_type_array(id_mangle_u(get_type_ident(frame_type), name), 1, ir_type_char);
+       ir_type *tp = new_type_array(1, ir_type_char);
        set_array_bounds_int(tp, 0, 0, size);
        set_type_alignment_bytes(tp, alignment);
 
+       snprintf(buf, sizeof(buf), "trampolin%u", area_cnt++);
+       ident *name = new_id_from_str(buf);
        ir_entity *area = new_entity(frame_type, name, tp);
 
        /* mark this entity as compiler generated */
@@ -1156,11 +1148,11 @@ static ir_entity *alloc_trampoline(ir_type *frame_type, int size, unsigned align
 }
 
 /**
- * Return a node representing a trampoline reagion
- * for a given entity.
+ * Return a node representing a trampoline region
+ * for a given function entity.
  *
  * @param dbgi    debug info
- * @param entity  the entity
+ * @param entity  the function entity
  */
 static ir_node *get_trampoline_region(dbg_info *dbgi, ir_entity *entity)
 {
@@ -1212,11 +1204,11 @@ static ir_node *create_symconst(dbg_info *dbgi, ir_mode *mode,
 }
 
 /**
- * Creates a SymConst for a given trampoline of an entity.
+ * Creates a trampoline for a function represented by an entity.
  *
  * @param dbgi    debug info
- * @param mode    the (reference) mode for the SymConst
- * @param entity  the entity
+ * @param mode    the (reference) mode for the function address
+ * @param entity  the function entity
  */
 static ir_node *create_trampoline(dbg_info *dbgi, ir_mode *mode,
                                   ir_entity *entity)
@@ -1245,15 +1237,13 @@ static ir_node *string_to_firm(const source_position_t *const src_pos,
 {
        ir_type  *const global_type = get_glob_type();
        dbg_info *const dbgi        = get_dbg_info(src_pos);
-       ir_type  *const type        = new_d_type_array(id_unique("strtype.%u"), 1,
-                                                      ir_type_const_char, dbgi);
+       ir_type  *const type        = new_type_array(1, ir_type_const_char);
 
        ident     *const id     = id_unique(id_prefix);
        ir_entity *const entity = new_d_entity(global_type, id, type, dbgi);
        set_entity_ld_ident(entity, id);
-       set_entity_variability(entity, variability_constant);
-       set_entity_allocation(entity, allocation_static);
-       set_entity_visibility(entity, visibility_local);
+       set_entity_visibility(entity, ir_visibility_local);
+       add_entity_linkage(entity, IR_LINKAGE_CONSTANT);
 
        ir_type *const elem_type = ir_type_const_char;
        ir_mode *const mode      = get_type_mode(elem_type);
@@ -1266,13 +1256,13 @@ static ir_node *string_to_firm(const source_position_t *const src_pos,
        set_type_size_bytes(type, slen);
        set_type_state(type, layout_fixed);
 
-       tarval **const tvs = xmalloc(slen * sizeof(tvs[0]));
+       ir_initializer_t *initializer = create_initializer_compound(slen);
        for (size_t i = 0; i < slen; ++i) {
-               tvs[i] = new_tarval_from_long(string[i], mode);
+               tarval           *tv  = new_tarval_from_long(string[i], mode);
+               ir_initializer_t *val = create_initializer_tarval(tv);
+               set_initializer_compound_value(initializer, i, val);
        }
-
-       set_array_entity_values(entity, tvs, slen);
-       free(tvs);
+       set_entity_initializer(entity, initializer);
 
        return create_symconst(dbgi, mode_P_data, entity);
 }
@@ -1300,14 +1290,13 @@ static ir_node *wide_string_literal_to_firm(
        ir_type *const global_type = get_glob_type();
        ir_type *const elem_type   = ir_type_wchar_t;
        dbg_info *const dbgi       = get_dbg_info(&literal->base.source_position);
-       ir_type *const type        = new_d_type_array(id_unique("strtype.%u"), 1,
-                                                   elem_type, dbgi);
+       ir_type *const type        = new_type_array(1, elem_type);
 
        ident     *const id     = id_unique("Lstr.%u");
        ir_entity *const entity = new_d_entity(global_type, id, type, dbgi);
        set_entity_ld_ident(entity, id);
-       set_entity_variability(entity, variability_constant);
-       set_entity_allocation(entity, allocation_static);
+       set_entity_visibility(entity, ir_visibility_local);
+       add_entity_linkage(entity, IR_LINKAGE_CONSTANT);
 
        ir_mode *const mode      = get_type_mode(elem_type);
 
@@ -1316,16 +1305,16 @@ static ir_node *wide_string_literal_to_firm(
 
        set_array_lower_bound_int(type, 0, 0);
        set_array_upper_bound_int(type, 0, slen);
-       set_type_size_bytes(type, slen);
+       set_type_size_bytes(type, slen * get_mode_size_bytes(mode));
        set_type_state(type, layout_fixed);
 
-       tarval **const tvs = xmalloc(slen * sizeof(tvs[0]));
+       ir_initializer_t *initializer = create_initializer_compound(slen);
        for (size_t i = 0; i < slen; ++i) {
-               tvs[i] = new_tarval_from_long(string[i], mode);
+               tarval           *tv  = new_tarval_from_long(string[i], mode);
+               ir_initializer_t *val = create_initializer_tarval(tv);
+               set_initializer_compound_value(initializer, i, val);
        }
-
-       set_array_entity_values(entity, tvs, slen);
-       free(tvs);
+       set_entity_initializer(entity, initializer);
 
        return create_symconst(dbgi, mode_P_data, entity);
 }
@@ -1688,6 +1677,8 @@ static ir_node *process_builtin_call(const call_expression_t *call)
        }
 
        case bk_gnu_builtin_huge_val:
+       case bk_gnu_builtin_huge_valf:
+       case bk_gnu_builtin_huge_vall:
        case bk_gnu_builtin_inf:
        case bk_gnu_builtin_inff:
        case bk_gnu_builtin_infl: {
@@ -1904,9 +1895,9 @@ static ir_node *call_expression_to_firm(const call_expression_t *const call)
 
                /* we need to construct a new method type matching the call
                 * arguments... */
+               type_dbg_info *tdbgi = get_type_dbg_info_((const type_t*) function_type);
                int n_res       = get_method_n_ress(ir_method_type);
-               new_method_type = new_d_type_method(id_unique("calltype.%u"),
-                                                   n_parameters, n_res, dbgi);
+               new_method_type = new_d_type_method(n_parameters, n_res, tdbgi);
                set_method_calling_convention(new_method_type,
                               get_method_calling_convention(ir_method_type));
                set_method_additional_properties(new_method_type,
@@ -1951,7 +1942,7 @@ static ir_node *call_expression_to_firm(const call_expression_t *const call)
        ir_node  *store = get_store();
        ir_node  *node  = new_d_Call(dbgi, store, callee, n_parameters, in,
                                     ir_method_type);
-       ir_node  *mem   = new_d_Proj(dbgi, node, mode_M, pn_Call_M_regular);
+       ir_node  *mem   = new_d_Proj(dbgi, node, mode_M, pn_Call_M);
        set_store(mem);
 
        type_t  *return_type = skip_typeref(function_type->return_type);
@@ -2011,7 +2002,7 @@ static void assign_value(dbg_info *dbgi, ir_node *addr, type_t *type,
        } else {
                ir_type *irtype    = get_ir_type(type);
                ir_node *copyb     = new_d_CopyB(dbgi, memory, addr, value, irtype);
-               ir_node *copyb_mem = new_Proj(copyb, mode_M, pn_CopyB_M_regular);
+               ir_node *copyb_mem = new_Proj(copyb, mode_M, pn_CopyB_M);
                set_store(copyb_mem);
        }
 }
@@ -2909,8 +2900,6 @@ static ir_node *compound_literal_to_firm(
        ir_entity *const entity = new_d_entity(frame_type, id, irtype, dbgi);
        set_entity_ld_ident(entity, id);
 
-       set_entity_variability(entity, variability_uninitialized);
-
        /* create initialisation code */
        initializer_t *initializer = expression->initializer;
        create_local_initializer(initializer, dbgi, entity, type);
@@ -3677,14 +3666,8 @@ static void create_variable_entity(entity_t *variable,
 
        variable->declaration.kind  = (unsigned char) declaration_kind;
        variable->variable.v.entity = irentity;
-       set_entity_variability(irentity, variability_uninitialized);
        set_entity_ld_ident(irentity, create_ld_ident(variable));
 
-       if (parent_type == get_tls_type())
-               set_entity_allocation(irentity, allocation_automatic);
-       else if (declaration_kind == DECLARATION_KIND_GLOBAL_VARIABLE)
-               set_entity_allocation(irentity, allocation_static);
-
        if (type->base.qualifiers & TYPE_QUALIFIER_VOLATILE) {
                set_entity_volatility(irentity, volatility_is_volatile);
        }
@@ -4285,16 +4268,15 @@ static void create_local_initializer(initializer_t *initializer, dbg_info *dbgi,
        ir_entity *const init_entity = new_d_entity(global_type, id, irtype, dbgi);
        set_entity_ld_ident(init_entity, id);
 
-       set_entity_variability(init_entity, variability_initialized);
-       set_entity_visibility(init_entity, visibility_local);
-       set_entity_allocation(init_entity, allocation_static);
+       set_entity_visibility(init_entity, ir_visibility_local);
+       add_entity_linkage(init_entity, IR_LINKAGE_CONSTANT);
 
        set_entity_initializer(init_entity, irinitializer);
 
        ir_node *const src_addr = create_symconst(dbgi, mode_P_data, init_entity);
        ir_node *const copyb    = new_d_CopyB(dbgi, memory, addr, src_addr, irtype);
 
-       ir_node *const copyb_mem = new_Proj(copyb, mode_M, pn_CopyB_M_regular);
+       ir_node *const copyb_mem = new_Proj(copyb, mode_M, pn_CopyB_M);
        set_store(copyb_mem);
 }
 
@@ -4344,10 +4326,9 @@ static void create_variable_initializer(entity_t *entity)
 
                        ir_entity *irentity = entity->variable.v.entity;
 
-                       if (tq & TYPE_QUALIFIER_CONST) {
-                               set_entity_variability(irentity, variability_constant);
-                       } else {
-                               set_entity_variability(irentity, variability_initialized);
+                       if (tq & TYPE_QUALIFIER_CONST
+                                       && get_entity_owner(irentity) != get_tls_type()) {
+                               add_entity_linkage(irentity, IR_LINKAGE_CONSTANT);
                        }
                        set_atomic_ent_value(irentity, value);
                }
@@ -4360,9 +4341,7 @@ static void create_variable_initializer(entity_t *entity)
                        = create_ir_initializer(initializer, type);
 
                if (tq & TYPE_QUALIFIER_CONST) {
-                       set_entity_variability(irentity, variability_constant);
-               } else {
-                       set_entity_variability(irentity, variability_initialized);
+                       add_entity_linkage(irentity, IR_LINKAGE_CONSTANT);
                }
                set_entity_initializer(irentity, irinitializer);
        }
@@ -4453,8 +4432,7 @@ static void create_local_static_variable(entity_t *entity)
        size_t l = strlen(entity->base.symbol->string);
        char   buf[l + sizeof(".%u")];
        snprintf(buf, sizeof(buf), "%s.%%u", entity->base.symbol->string);
-       ident     *const id = id_unique(buf);
-
+       ident     *const id       = id_unique(buf);
        ir_entity *const irentity = new_d_entity(var_type, id, irtype, dbgi);
 
        if (type->base.qualifiers & TYPE_QUALIFIER_VOLATILE) {
@@ -4465,10 +4443,7 @@ static void create_local_static_variable(entity_t *entity)
        entity->variable.v.entity = irentity;
 
        set_entity_ld_ident(irentity, id);
-       set_entity_variability(irentity, variability_uninitialized);
-       set_entity_visibility(irentity, visibility_local);
-       set_entity_allocation(irentity, entity->variable.thread_local ?
-               allocation_automatic : allocation_static);
+       set_entity_visibility(irentity, ir_visibility_local);
 
        ir_graph *const old_current_ir_graph = current_ir_graph;
        current_ir_graph = get_const_code_irg();
@@ -4567,22 +4542,36 @@ static ir_node *compound_statement_to_firm(compound_statement_t *compound)
 
 static void create_global_variable(entity_t *entity)
 {
+       ir_linkage    linkage    = 0;
+       ir_visibility visibility = ir_visibility_default;
+       ir_entity    *irentity;
        assert(entity->kind == ENTITY_VARIABLE);
 
-       ir_visibility vis;
        switch ((storage_class_tag_t)entity->declaration.storage_class) {
-               case STORAGE_CLASS_STATIC: vis = visibility_local;              break;
-               case STORAGE_CLASS_EXTERN: vis = visibility_external_allocated; break;
-               case STORAGE_CLASS_NONE:   vis = visibility_external_visible;   break;
-
-               default: panic("Invalid storage class for global variable");
+       case STORAGE_CLASS_EXTERN: visibility = ir_visibility_external; break;
+       case STORAGE_CLASS_STATIC: visibility = ir_visibility_local;    break;
+       case STORAGE_CLASS_NONE:
+               visibility = ir_visibility_default;
+               /* uninitialized globals get merged in C */
+               if (entity->variable.initializer == NULL)
+                       linkage |= IR_LINKAGE_MERGE;
+               break;
+       case STORAGE_CLASS_TYPEDEF:
+       case STORAGE_CLASS_AUTO:
+       case STORAGE_CLASS_REGISTER:
+               panic("invalid storage class for global var");
        }
 
-       ir_type *var_type = entity->variable.thread_local ?
-               get_tls_type() : get_glob_type();
-       create_variable_entity(entity,
-                       DECLARATION_KIND_GLOBAL_VARIABLE, var_type);
-       set_entity_visibility(entity->variable.v.entity, vis);
+       ir_type *var_type = get_glob_type();
+       if (entity->variable.thread_local) {
+               var_type = get_tls_type();
+               /* LINKAGE_MERGE not supported by current linkers */
+               linkage &= ~IR_LINKAGE_MERGE;
+       }
+       create_variable_entity(entity, DECLARATION_KIND_GLOBAL_VARIABLE, var_type);
+       irentity = entity->variable.v.entity;
+       add_entity_linkage(irentity, linkage);
+       set_entity_visibility(irentity, visibility);
 }
 
 static void create_local_declaration(entity_t *entity)
@@ -4987,12 +4976,14 @@ static ir_node *get_break_label(void)
 
 static void switch_statement_to_firm(switch_statement_t *statement)
 {
-       ir_node  *first_block = get_cur_block();
+       ir_node  *first_block = NULL;
        dbg_info *dbgi        = get_dbg_info(&statement->base.source_position);
        ir_node  *cond        = NULL;
-       if (first_block != NULL) {
+
+       if (get_cur_block() != NULL) {
                ir_node *expression = expression_to_firm(statement->expression);
                cond                = new_d_Cond(dbgi, expression);
+               first_block         = get_cur_block();
        }
 
        set_cur_block(NULL);
@@ -5255,7 +5246,7 @@ static void asm_statement_to_firm(const asm_statement_t *statement)
                                char     buf[64];
                                ir_node *value = get_value_from_lvalue(expr, addr);
 
-                               snprintf(buf, sizeof(buf), "%u", out_size);
+                               snprintf(buf, sizeof(buf), "%u", (unsigned) out_size);
 
                                ir_asm_constraint constraint;
                                constraint.pos              = pos;
@@ -5569,7 +5560,7 @@ static void initialize_function_parameters(entity_t *entity)
 
        if (entity->function.need_closure) {
                /* add an extra parameter for the static link */
-               entity->function.static_link = new_r_Proj(irg, start_block, args, mode_P_data, 0);
+               entity->function.static_link = new_r_Proj(start_block, args, mode_P_data, 0);
                ++first_param_nr;
        }
 
@@ -5603,7 +5594,7 @@ static void initialize_function_parameters(entity_t *entity)
                ir_mode *param_mode   = get_type_mode(param_irtype);
 
                long     pn    = n + first_param_nr;
-               ir_node *value = new_r_Proj(irg, start_block, args, param_mode, pn);
+               ir_node *value = new_r_Proj(start_block, args, param_mode, pn);
 
                ir_mode *mode = get_ir_mode_storage(type);
                value = create_conv(NULL, value, mode);
@@ -5663,17 +5654,22 @@ static void add_function_pointer(ir_type *segment, ir_entity *method,
                                  const char *unique_template)
 {
        ir_type   *method_type  = get_entity_type(method);
-       ident     *id           = id_unique(unique_template);
-       ir_type   *ptr_type     = new_type_pointer(id, method_type, mode_P_code);
+       ir_type   *ptr_type     = new_type_pointer(method_type);
 
+       /* these entities don't really have a name but firm only allows
+        * "" in ld_ident.
+        * Note that we mustn't give these entities a name since for example
+        * Mach-O doesn't allow them. */
        ident     *ide          = id_unique(unique_template);
        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);
 
+       set_entity_ld_ident(ptr, new_id_from_chars("", 0));
        set_entity_compiler_generated(ptr, 1);
-       set_entity_variability(ptr, variability_constant);
+       set_entity_visibility(ptr, ir_visibility_local);
+       add_entity_linkage(ptr, IR_LINKAGE_CONSTANT|IR_LINKAGE_HIDDEN_USER);
        set_atomic_ent_value(ptr, val);
 }
 
@@ -5906,6 +5902,9 @@ void init_ast2firm(void)
        obstack_init(&asm_obst);
        init_atomic_modes();
 
+       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: