introduce versioning magic into auto* build
[libfirm] / ir / ir / irprofile.c
index 562068c..5ff78fe 100644 (file)
@@ -274,11 +274,11 @@ static void create_location_data(dbg_info *dbg, block_id_walker_data_t *wd)
                        int     i, len = strlen(fname) + 1;
                        tarval  **tarval_string;
 
-                       snprintf(buf, sizeof(buf), "firm_name_arr.%d", nr);
+                       snprintf(buf, sizeof(buf), "firm_name_arr.%u", nr);
                        arr = new_type_array(1, wd->tp_char);
                        set_array_bounds_int(arr, 0, 0, len);
 
-                       snprintf(buf, sizeof(buf), "__firm_name.%d", nr++);
+                       snprintf(buf, sizeof(buf), "__firm_name.%u", nr++);
                        id = new_id_from_str(buf);
                        ent = new_entity(get_glob_type(), id, arr);
                        set_entity_ld_ident(ent, id);
@@ -341,7 +341,6 @@ ir_graph *ir_profile_instrument(const char *filename, unsigned flags)
        ir_type *loc_type = NULL;
        ir_type *charptr_type;
        ir_type *gtp;
-       ir_node *start_block;
        tarval **tarval_array;
        tarval **tarval_string;
        tarval *tv;
@@ -460,7 +459,6 @@ ir_graph *ir_profile_instrument(const char *filename, unsigned flags)
                wd.symconst  = new_r_SymConst(irg, mode_P_data, sym, symconst_addr_ent);
 
                irg_block_walk_graph(irg, block_id_walker, NULL, &wd);
-               start_block = get_irg_start_block(irg);
                env.end_block   = get_irg_end_block(irg);
                irg_block_walk_graph(irg, fix_ssa, NULL, &env);
                for (i = get_Block_n_cfgpreds(endbb) - 1; i >= 0; --i) {
@@ -524,6 +522,7 @@ ir_graph *ir_profile_instrument(const char *filename, unsigned flags)
                        add_compound_ent_value_w_path(ent_locations, n, path);
                }
                pmap_destroy(wd.fname_map);
+               current_ir_graph = rem;
        }
        return gen_initializer_irg(ent_filename, bblock_id, bblock_counts, n_blocks);
 }