X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Firmemory.c;h=77e71c3d7602e47dac36a5adfe876b7c63088d59;hb=f6aeac6a547a52beb3cb663c5e63c05c9c3728ea;hp=7d279a0b4d7787c9789137af91931bfe2dad1f18;hpb=85192c44dbe932a07672b05bff0126fc5e6ca421;p=libfirm diff --git a/ir/ana/irmemory.c b/ir/ana/irmemory.c index 7d279a0b4..77e71c3d7 100644 --- a/ir/ana/irmemory.c +++ b/ir/ana/irmemory.c @@ -29,10 +29,13 @@ #endif #include +#include +#include "adt/pmap.h" #include "irnode_t.h" #include "irgraph_t.h" #include "irprog_t.h" +#include "irmemory_t.h" #include "irmemory.h" #include "irflag.h" #include "hashptr.h" @@ -42,9 +45,11 @@ #include "irprintf.h" #include "debug.h" #include "error.h" +#include "typerep.h" /** The debug handle. */ DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;) +DEBUG_ONLY(static firm_dbg_module_t *dbgcall = NULL;) /** The source language specific language disambiguator function. */ static DISAMBIGUATOR_FUNC language_disambuigator = NULL; @@ -104,6 +109,9 @@ static ir_node *find_base_adr(ir_node *sel, ir_entity **pEnt) { /** * Check if a given Const node is greater or equal a given size. * + * @param cns a Const node + * @param size a integer size + * * @return ir_no_alias if the Const is greater, ir_may_alias else */ static ir_alias_relation check_const(ir_node *cns, int size) { @@ -119,6 +127,10 @@ static ir_alias_relation check_const(ir_node *cns, int size) { /** * Treat idx1 and idx2 as integer indexes and check if they differ always more than size. * + * @param idx1 a node representing the first index + * @param idx2 a node representing the second index + * @param size an integer size + * * @return ir_sure_alias iff idx1 == idx2 * ir_no_alias iff they ALWAYS differ more than size * ir_may_alias else @@ -354,15 +366,11 @@ static ir_alias_relation different_types(ir_node *adr1, ir_node *adr2) ir_type *tp2 = get_entity_type(ent2); if (tp1 != tp2) { -#if 0 - if (is_Pointer_type(tp1) && is_Pointer_type(tp2)) { - /* do deref until no pointer types are found */ - do { - tp1 = get_pointer_points_to_type(tp1); - tp2 = get_pointer_points_to_type(tp2); - } while (is_Pointer_type(tp1) && is_Pointer_type(tp2)); + /* do deref until no pointer types are found */ + while (is_Pointer_type(tp1) && is_Pointer_type(tp2)) { + tp1 = get_pointer_points_to_type(tp1); + tp2 = get_pointer_points_to_type(tp2); } -#endif if (get_type_tpop(tp1) != get_type_tpop(tp2)) { /* different type structure */ @@ -418,17 +426,17 @@ ir_storage_class_class_t classify_pointer(ir_graph *irg, ir_node *irn, ir_entity if (is_Global(irn)) { ir_entity *entity = get_Global_entity(irn); res = ir_sc_globalvar; - if (get_entity_address_taken(entity) == ir_address_not_taken) + if (! (get_entity_usage(entity) & ir_usage_address_taken)) res |= ir_sc_modifier_nottaken; } else if (irn == get_irg_frame(irg)) { res = ir_sc_localvar; - if (ent != NULL && get_entity_address_taken(ent) == ir_address_not_taken) + if (ent != NULL && !(get_entity_usage(ent) & ir_usage_address_taken)) res |= ir_sc_modifier_nottaken; } else if (is_arg_Proj(irn)) { return ir_sc_argument; } else if (irn == get_irg_tls(irg)) { res = ir_sc_tls; - if (ent != NULL && get_entity_address_taken(ent) == ir_address_not_taken) + if (ent != NULL && !(get_entity_usage(ent) & ir_usage_address_taken)) res |= ir_sc_modifier_nottaken; } else if (is_Proj(irn) && is_malloc_Result(irn)) { return ir_sc_malloced; @@ -454,6 +462,14 @@ static ir_node *skip_Bitfield_Sels(ir_node *adr) { /** * Determine the alias relation between two addresses. + * + * @param irg the graph of both memory operations + * @param addr1 pointer address of the first memory operation + * @param mode1 the mode of the accessed data through addr1 + * @param addr2 pointer address of the second memory operation + * @param mode2 the mode of the accessed data through addr2 + * + * @return found memory relation */ static ir_alias_relation _get_alias_relation( ir_graph *irg, @@ -491,7 +507,7 @@ static ir_alias_relation _get_alias_relation( have_const_offsets = 1; while (is_Add(adr1)) { ir_node *add_right = get_Add_right(adr1); - if (is_Const(add_right)) { + if (is_Const(add_right) && !mode_is_reference(get_irn_mode(add_right))) { tarval *tv = get_Const_tarval(add_right); offset1 += get_tarval_long(tv); adr1 = get_Add_left(adr1); @@ -505,7 +521,7 @@ static ir_alias_relation _get_alias_relation( } while (is_Add(adr2)) { ir_node *add_right = get_Add_right(adr2); - if (is_Const(add_right)) { + if (is_Const(add_right) && !mode_is_reference(get_irn_mode(add_right))) { tarval *tv = get_Const_tarval(add_right); offset2 += get_tarval_long(tv); adr2 = get_Add_left(adr2); @@ -543,7 +559,7 @@ static ir_alias_relation _get_alias_relation( adr1 = skip_Bitfield_Sels(adr1); adr2 = skip_Bitfield_Sels(adr2); - /* skip sels */ + /* skip Sels */ base1 = adr1; base2 = adr2; ent1 = NULL; @@ -555,7 +571,7 @@ static ir_alias_relation _get_alias_relation( base2 = find_base_adr(adr2, &ent2); } - /* same base address -> compare sel entities */ + /* same base address -> compare Sel entities */ if (base1 == base2 && ent1 != NULL && ent2 != NULL) { if (ent1 != ent2) return ir_no_alias; @@ -563,7 +579,36 @@ static ir_alias_relation _get_alias_relation( return different_sel_offsets(adr1, adr2); } - /* Type based alias analysis */ + class1 = classify_pointer(irg, base1, ent1); + class2 = classify_pointer(irg, base2, ent2); + + if (class1 == ir_sc_pointer) { + if (class2 & ir_sc_modifier_nottaken) { + /* a pointer and an object whose objects was never taken */ + return ir_no_alias; + } + } else if (class2 == ir_sc_pointer) { + if (class1 & ir_sc_modifier_nottaken) { + /* a pointer and an object whose objects was never taken */ + return ir_no_alias; + } + } else if (class1 != class2) { + /* two objects from different memory spaces */ + return ir_no_alias; + } else { + /* both classes are equal */ + if (class1 == ir_sc_globalvar) { + ir_entity *entity1 = get_SymConst_entity(base1); + ir_entity *entity2 = get_SymConst_entity(base2); + if (entity1 != entity2) + return ir_no_alias; + + /* for some reason CSE didn't happen yet for the 2 SymConsts... */ + return ir_may_alias; + } + } + + /* Type based alias analysis */ if (options & aa_opt_type_based) { ir_alias_relation rel; @@ -582,6 +627,10 @@ static ir_alias_relation _get_alias_relation( if (mode_is_reference(mode1) != mode_is_reference(mode2)) return ir_no_alias; + /* cheap test: if arithmetic is different, no alias */ + if (get_mode_arithmetic(mode1) != get_mode_arithmetic(mode2)) + return ir_no_alias; + /* try rule R5 */ rel = different_types(orig_adr1, orig_adr2); if (rel != ir_may_alias) @@ -589,37 +638,6 @@ static ir_alias_relation _get_alias_relation( leave_type_based_alias:; } - class1 = classify_pointer(irg, base1, ent1); - class2 = classify_pointer(irg, base2, ent2); - - if (class1 == ir_sc_pointer) { - if (class2 & ir_sc_modifier_nottaken) { - return ir_no_alias; - } else { - return ir_may_alias; - } - } else if (class2 == ir_sc_pointer) { - if (class1 & ir_sc_modifier_nottaken) { - return ir_no_alias; - } else { - return ir_may_alias; - } - } - - if (class1 != class2) { - return ir_no_alias; - } - - if (class1 == ir_sc_globalvar) { - ir_entity *entity1 = get_SymConst_entity(base1); - ir_entity *entity2 = get_SymConst_entity(base2); - if (entity1 != entity2) - return ir_no_alias; - - /* for some reason CSE didn't happen yet for the 2 SymConsts... */ - return ir_may_alias; - } - /* do we have a language specific memory disambiguator? */ if (language_disambuigator) { ir_alias_relation rel = (*language_disambuigator)(irg, orig_adr1, mode1, orig_adr2, mode2); @@ -740,105 +758,154 @@ void mem_disambig_term(void) { * @return non-zero if the Load/Store is a hidden cast, zero else */ static int is_hidden_cast(ir_mode *mode, ir_mode *ent_mode) { + if (ent_mode == NULL) + return false; + if (ent_mode != mode) { if (ent_mode == NULL || get_mode_size_bits(ent_mode) != get_mode_size_bits(mode) || get_mode_sort(ent_mode) != get_mode_sort(mode) || get_mode_arithmetic(ent_mode) != irma_twos_complement || get_mode_arithmetic(mode) != irma_twos_complement) - return 1; + return true; } - return 0; + return false; } /* is_hidden_cast */ /** - * Determine the address_taken state of a node (or it's successor Sels). + * Determine the usage state of a node (or its successor Sels). * * @param irn the node */ -static ir_address_taken_state find_address_taken_state(ir_node *irn) { - int i, j; +static ir_entity_usage determine_entity_usage(const ir_node *irn, ir_entity *entity) { + int i; ir_mode *emode, *mode; ir_node *value; - ir_entity *ent; ir_type *tp; + ir_entity_usage res = 0; for (i = get_irn_n_outs(irn) - 1; i >= 0; --i) { ir_node *succ = get_irn_out(irn, i); switch (get_irn_opcode(succ)) { case iro_Load: + assert(irn == get_Load_ptr(succ)); + res |= ir_usage_read; + /* check if this load is not a hidden conversion */ - mode = get_Load_mode(succ); - ent = is_SymConst(irn) ? get_SymConst_entity(irn) : get_Sel_entity(irn); - emode = get_type_mode(get_entity_type(ent)); + mode = get_Load_mode(succ); + emode = get_type_mode(get_entity_type(entity)); if (is_hidden_cast(mode, emode)) - return ir_address_taken; + res |= ir_usage_reinterpret_cast; break; case iro_Store: /* check that the node is not the Store's value */ - value = get_Store_value(succ); - if (value == irn) - return ir_address_taken; - /* check if this Store is not a hidden conversion */ - mode = get_irn_mode(value); - ent = is_SymConst(irn) ? get_SymConst_entity(irn) : get_Sel_entity(irn); - emode = get_type_mode(get_entity_type(ent)); - if (is_hidden_cast(mode, emode)) - return ir_address_taken; + if (irn == get_Store_value(succ)) { + res |= ir_usage_unknown; + } + if (irn == get_Store_ptr(succ)) { + res |= ir_usage_write; + + /* check if this Store is not a hidden conversion */ + value = get_Store_value(succ); + mode = get_irn_mode(value); + emode = get_type_mode(get_entity_type(entity)); + if (is_hidden_cast(mode, emode)) + res |= ir_usage_reinterpret_cast; + } + assert(irn != get_Store_mem(succ)); break; case iro_CopyB: /* CopyB are like Loads/Stores */ - ent = is_SymConst(irn) ? get_SymConst_entity(irn) : get_Sel_entity(irn); - tp = get_entity_type(ent); + tp = get_entity_type(entity); if (tp != get_CopyB_type(succ)) { /* bad, different types, might be a hidden conversion */ - return ir_address_taken; + res |= ir_usage_reinterpret_cast; + } + if (irn == get_CopyB_dst(succ)) { + res |= ir_usage_write; + } else { + assert(irn == get_CopyB_src(succ)); + res |= ir_usage_read; } break; + case iro_Add: + case iro_Sub: case iro_Sel: { /* Check the successor of irn. */ - ir_address_taken_state res = find_address_taken_state(succ); - if (res != ir_address_not_taken) - return res; + res |= determine_entity_usage(succ, entity); break; } case iro_Call: - /* Only the call address is not an address taker but - this is an uninteresting case, so we ignore it here. */ - for (j = get_Call_n_params(succ) - 1; j >= 0; --j) { - ir_node *param = get_Call_param(succ, j); - if (param == irn) - return ir_address_taken; + if (irn == get_Call_ptr(succ)) { + /* TODO: we could check for reinterpret casts here... + * But I doubt anyone is interested in that bit for + * function entities and I'm too lazy to write the code now. + */ + res |= ir_usage_read; + } else { + assert(irn != get_Call_mem(succ)); + res |= ir_usage_unknown; + } + break; + + /* skip identities */ + case iro_Id: + res |= determine_entity_usage(succ, entity); + break; + + /* skip tuples */ + case iro_Tuple: { + int input_nr; + for (input_nr = get_Tuple_n_preds(succ) - 1; input_nr >= 0; + --input_nr) { + ir_node *pred = get_Tuple_pred(succ, input_nr); + if (pred == irn) { + int k; + /* we found one input */ + for (k = get_irn_n_outs(succ) - 1; k >= 0; --k) { + ir_node *proj = get_irn_out(succ, k); + + if (is_Proj(proj) && get_Proj_proj(proj) == input_nr) { + res |= determine_entity_usage(proj, entity); + break; + } + } + } } break; + } default: - /* another op, the address may be taken */ - return ir_address_taken_unknown; + /* another op, we don't know anything (we could do more advanced + * things like a dataflow analysis here) */ + res |= ir_usage_unknown; + break; } } - /* All successors finished, the address is not taken. */ - return ir_address_not_taken; -} /* find_address_taken_state */ + + return res; +} /** - * Update the "address taken" flag of all frame entities. + * Update the usage flags of all frame entities. */ -static void analyse_irg_address_taken(ir_graph *irg) { +static void analyse_irg_entity_usage(ir_graph *irg) { ir_type *ft = get_irg_frame_type(irg); ir_node *irg_frame; int i; /* set initial state to not_taken, as this is the "smallest" state */ for (i = get_class_n_members(ft) - 1; i >= 0; --i) { - ir_entity *ent = get_class_member(ft, i); + ir_entity *ent = get_class_member(ft, i); + ir_entity_usage flags = + get_entity_stickyness(ent) == stickyness_sticky ? ir_usage_unknown : 0; - set_entity_address_taken(ent, ir_address_not_taken); + set_entity_usage(ent, flags); } assure_irg_outs(irg); @@ -846,78 +913,83 @@ static void analyse_irg_address_taken(ir_graph *irg) { irg_frame = get_irg_frame(irg); for (i = get_irn_n_outs(irg_frame) - 1; i >= 0; --i) { - ir_node *succ = get_irn_out(irg_frame, i); - ir_address_taken_state state; + ir_node *succ = get_irn_out(irg_frame, i); + ir_entity *entity; + ir_entity_usage flags; - if (is_Sel(succ)) { - ir_entity *ent = get_Sel_entity(succ); + if (!is_Sel(succ)) + continue; - if (get_entity_address_taken(ent) == ir_address_taken) - continue; - - state = find_address_taken_state(succ); - if (state > get_entity_address_taken(ent)) - set_entity_address_taken(ent, state); - } + entity = get_Sel_entity(succ); + flags = get_entity_usage(entity); + flags |= determine_entity_usage(succ, entity); + set_entity_usage(entity, flags); } + /* now computed */ - irg->adr_taken_state = ir_address_taken_computed; -} /* analyse_address_taken */ + irg->entity_usage_state = ir_entity_usage_computed; +} -/* Returns the current address taken state of the graph. */ -ir_address_taken_computed_state get_irg_address_taken_state(const ir_graph *irg) { - return irg->adr_taken_state; -} /* get_irg_address_taken_state */ +ir_entity_usage_computed_state get_irg_entity_usage_state(const ir_graph *irg) { + return irg->entity_usage_state; +} -/* Sets the current address taken state of the graph. */ -void set_irg_address_taken_state(ir_graph *irg, ir_address_taken_computed_state state) { - irg->adr_taken_state = state; -} /* set_irg_address_taken_state */ +void set_irg_entity_usage_state(ir_graph *irg, ir_entity_usage_computed_state state) { + irg->entity_usage_state = state; +} + +void assure_irg_entity_usage_computed(ir_graph *irg) { + if (irg->entity_usage_state != ir_entity_usage_not_computed) + return; -/* Assure that the address taken flag is computed for the given graph. */ -void assure_irg_address_taken_computed(ir_graph *irg) { - if (irg->adr_taken_state == ir_address_taken_not_computed) - analyse_irg_address_taken(irg); -} /* assure_irg_address_taken_computed */ + analyse_irg_entity_usage(irg); +} /** - * Initialize the address_taken flag for a global type like type. + * Initialize the entity_usage flag for a global type like type. */ -static void init_taken_flag(ir_type * tp) { +static void init_entity_usage(ir_type * tp) { int i; - /* All external visible entities are at least - ir_address_taken_unknown. This is very conservative. */ + /* We have to be conservative: All external visible entities are unknown */ for (i = get_compound_n_members(tp) - 1; i >= 0; --i) { - ir_entity *ent = get_compound_member(tp, i); - ir_address_taken_state state; - - state = get_entity_visibility(ent) == visibility_external_visible ? - ir_address_taken_unknown : ir_address_not_taken ; - set_entity_address_taken(ent, state); + ir_entity *ent = get_compound_member(tp, i); + ir_entity_usage flags = ir_usage_none; + ir_visibility vis = get_entity_visibility(ent); + + if (vis == visibility_external_visible || + vis == visibility_external_allocated || + get_entity_stickyness(ent) == stickyness_sticky) { + flags |= ir_usage_unknown; + } + set_entity_usage(ent, flags); } -} /* init_taken_flag */ +} +/** + * Mark all entities used in the initializer as unknown usage. + * + * @param initializer the initializer to check + */ static void check_initializer_nodes(ir_initializer_t *initializer) { - switch (initializer->kind) { - case IR_INITIALIZER_CONST: { - ir_node *n = initializer->consti.value; + unsigned i; + ir_node *n; + switch (initializer->kind) { + case IR_INITIALIZER_CONST: /* let's check if it's an address */ + n = initializer->consti.value; if (is_Global(n)) { ir_entity *ent = get_Global_entity(n); - set_entity_address_taken(ent, ir_address_taken); + set_entity_usage(ent, ir_usage_unknown); } return; - } case IR_INITIALIZER_TARVAL: case IR_INITIALIZER_NULL: return; - case IR_INITIALIZER_COMPOUND: { - size_t i; - + case IR_INITIALIZER_COMPOUND: for (i = 0; i < initializer->compound.n_initializers; ++i) { ir_initializer_t *sub_initializer = initializer->compound.initializers[i]; @@ -925,12 +997,14 @@ static void check_initializer_nodes(ir_initializer_t *initializer) } return; } - } - panic("invalid initialzier found"); -} + panic("invalid initializer found"); +} /* check_initializer_nodes */ /** - * Mark all entities used in the initializer for the given entity as address taken + * Mark all entities used in the initializer for the given entity as unknown + * usage. + * + * @param ent the entity */ static void check_initializer(ir_entity *ent) { ir_node *n; @@ -940,8 +1014,8 @@ static void check_initializer(ir_entity *ent) { if (get_entity_variability(ent) == variability_uninitialized) return; - /* Beware: Methods initialized with "themself". This does not count as a taken - address. */ + /* Beware: Methods are always initialized with "themself". This does not + count as a taken address. */ if (is_Method_type(get_entity_type(ent))) return; @@ -952,7 +1026,7 @@ static void check_initializer(ir_entity *ent) { n = get_atomic_ent_value(ent); if (is_Global(n)) { ir_entity *ent = get_Global_entity(n); - set_entity_address_taken(ent, ir_address_taken); + set_entity_usage(ent, ir_usage_unknown); } } else { for (i = get_compound_ent_n_values(ent) - 1; i >= 0; --i) { @@ -961,7 +1035,7 @@ static void check_initializer(ir_entity *ent) { /* let's check if it's an address */ if (is_Global(n)) { ir_entity *ent = get_Global_entity(n); - set_entity_address_taken(ent, ir_address_taken); + set_entity_usage(ent, ir_usage_unknown); } } } @@ -969,7 +1043,9 @@ static void check_initializer(ir_entity *ent) { /** - * Mark all entities used in initializers as address taken + * Mark all entities used in initializers as unknown usage. + * + * @param tp a compound type */ static void check_initializers(ir_type *tp) { int i; @@ -983,20 +1059,30 @@ static void check_initializers(ir_type *tp) { #ifdef DEBUG_libfirm /** - * Print the address taken state of all entities of a given type for debugging. + * Print the entity usage flags of all entities of a given type for debugging. + * + * @param tp a compound type */ -static void print_address_taken_state(ir_type *tp) { +static void print_entity_usage_flags(ir_type *tp) { int i; for (i = get_compound_n_members(tp) - 1; i >= 0; --i) { ir_entity *ent = get_compound_member(tp, i); - ir_address_taken_state state = get_entity_address_taken(ent); - - if (state != ir_address_not_taken) { - assert(ir_address_not_taken <= (int) state && state <= ir_address_taken); - ir_printf("%+F: %s\n", ent, get_address_taken_state_name(state)); - } + ir_entity_usage flags = get_entity_usage(ent); + + if (flags == 0) + continue; + ir_printf("%+F:", ent); + if (flags & ir_usage_address_taken) + printf(" address_taken"); + if (flags & ir_usage_read) + printf(" read"); + if (flags & ir_usage_write) + printf(" write"); + if (flags & ir_usage_reinterpret_cast) + printf(" reinterp_cast"); + printf("\n"); } -} /* print_address_taken_state */ +} #endif /* DEBUG_libfirm */ /** @@ -1005,7 +1091,7 @@ static void print_address_taken_state(ir_type *tp) { static void check_global_address(ir_node *irn, void *env) { ir_node *tls = env; ir_entity *ent; - ir_address_taken_state state; + ir_entity_usage flags; if (is_Global(irn)) { /* A global. */ @@ -1016,28 +1102,27 @@ static void check_global_address(ir_node *irn, void *env) { } else return; - if (get_entity_address_taken(ent) >= ir_address_taken) { - /* Already at the maximum. */ - return; - } - state = find_address_taken_state(irn); - if (state > get_entity_address_taken(ent)) - set_entity_address_taken(ent, state); + flags = get_entity_usage(ent); + flags |= determine_entity_usage(irn, ent); + set_entity_usage(ent, flags); } /* check_global_address */ /** - * Update the "address taken" flag of all global entities. + * Update the entity usage flags of all global entities. */ -static void analyse_irp_globals_address_taken(void) { +static void analyse_irp_globals_entity_usage(void) { int i; + ir_segment_t s; - FIRM_DBG_REGISTER(dbg, "firm.ana.irmemory"); - - init_taken_flag(get_glob_type()); - init_taken_flag(get_tls_type()); + for (s = IR_SEGMENT_FIRST; s < IR_SEGMENT_COUNT; ++s) { + ir_type *type = get_segment_type(s); + init_entity_usage(type); + } - check_initializers(get_glob_type()); - check_initializers(get_tls_type()); + for (s = IR_SEGMENT_FIRST; s < IR_SEGMENT_COUNT; ++s) { + ir_type *type = get_segment_type(s); + check_initializers(type); + } for (i = get_irp_n_irgs() - 1; i >= 0; --i) { ir_graph *irg = get_irp_irg(i); @@ -1048,42 +1133,48 @@ static void analyse_irp_globals_address_taken(void) { #ifdef DEBUG_libfirm if (firm_dbg_get_mask(dbg) & LEVEL_1) { - print_address_taken_state(get_glob_type()); - print_address_taken_state(get_tls_type()); + ir_segment_t s; + for (s = IR_SEGMENT_FIRST; s < IR_SEGMENT_COUNT; ++s) { + print_entity_usage_flags(get_segment_type(s)); + } } #endif /* DEBUG_libfirm */ /* now computed */ - irp->globals_adr_taken_state = ir_address_taken_computed; -} /* analyse_irp_globals_address_taken */ + irp->globals_entity_usage_state = ir_entity_usage_computed; +} /* Returns the current address taken state of the globals. */ -ir_address_taken_computed_state get_irp_globals_address_taken_state(void) { - return irp->globals_adr_taken_state; -} /* get_irp_globals_address_taken_state */ +ir_entity_usage_computed_state get_irp_globals_entity_usage_state(void) { + return irp->globals_entity_usage_state; +} /* Sets the current address taken state of the graph. */ -void set_irp_globals_address_taken_state(ir_address_taken_computed_state state) { - irp->globals_adr_taken_state = state; -} /* set_irg_address_taken_state */ +void set_irp_globals_entity_usage_state(ir_entity_usage_computed_state state) { + irp->globals_entity_usage_state = state; +} /* Assure that the address taken flag is computed for the globals. */ -void assure_irp_globals_address_taken_computed(void) { - if (irp->globals_adr_taken_state == ir_address_taken_not_computed) - analyse_irp_globals_address_taken(); -} /* assure_irp_globals_address_taken_computed */ +void assure_irp_globals_entity_usage_computed(void) { + if (irp->globals_entity_usage_state != ir_entity_usage_not_computed) + return; + analyse_irp_globals_entity_usage(); +} -#include -#include "typerep.h" +void firm_init_memory_disambiguator(void) { + FIRM_DBG_REGISTER(dbg, "firm.ana.irmemory"); + FIRM_DBG_REGISTER(dbgcall, "firm.opt.cc"); +} -DEBUG_ONLY(static firm_dbg_module_t *dbgcall = NULL;) /** Maps method types to cloned method types. */ static pmap *mtp_map; /** * Clone a method type if not already cloned. + * + * @param tp the type to clone */ static ir_type *clone_type_and_cache(ir_type *tp) { static ident *prefix = NULL; @@ -1104,7 +1195,8 @@ static ir_type *clone_type_and_cache(ir_type *tp) { } /* clone_type_and_cache */ /** - * Copy the calling conventions from the entities to the call type. + * Walker: clone all call types of Calls to methods having the + * mtp_property_private property set. */ static void update_calls_to_private(ir_node *call, void *env) { (void) env; @@ -1132,22 +1224,20 @@ void mark_private_methods(void) { int i; int changed = 0; - FIRM_DBG_REGISTER(dbgcall, "firm.opt.cc"); - - assure_irp_globals_address_taken_computed(); + assure_irp_globals_entity_usage_computed(); mtp_map = pmap_create(); /* first step: change the calling conventions of the local non-escaped entities */ for (i = get_irp_n_irgs() - 1; i >= 0; --i) { - ir_graph *irg = get_irp_irg(i); - ir_entity *ent = get_irg_entity(irg); - ir_address_taken_state state = get_entity_address_taken(ent); + ir_graph *irg = get_irp_irg(i); + ir_entity *ent = get_irg_entity(irg); + ir_entity_usage flags = get_entity_usage(ent); /* If an entity is sticky, it might be called from external places (like inline assembler), so do NOT mark it as private. */ if (get_entity_visibility(ent) == visibility_local && - state == ir_address_not_taken && + !(flags & ir_usage_address_taken) && get_entity_stickyness(ent) != stickyness_sticky) { ir_type *mtp = get_entity_type(ent);