X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Fcgana.c;h=548ed9e6a8f860b9a6611ee6c3e8715434eb7e79;hb=4bad1346ff2abc3923beea23e5ac949acc7ca514;hp=0bab083c6e2c22599cdf44edee985d104a074400;hpb=6d3cc33efb41b34b6d392c489921855f32c9baf5;p=libfirm diff --git a/ir/ana/cgana.c b/ir/ana/cgana.c index 0bab083c6..548ed9e6a 100644 --- a/ir/ana/cgana.c +++ b/ir/ana/cgana.c @@ -11,34 +11,43 @@ */ /** + * @file cgana.c * Intraprozedurale Analyse zur Abschätzung der Aufrufrelation. Es * wird eine Menge von freien Methoden und anschließend die an den * Call-Operationen aufrufbaren Methoden bestimmt. * */ #ifdef HAVE_CONFIG_H -# include +# include "config.h" +#endif + +#ifdef HAVE_STRING_H +# include #endif -#include #include "cgana.h" #include "rta.h" - -#include "eset.h" -#include "pmap.h" -#include "array.h" -#include "irprog.h" +#include "xmalloc.h" +#include "irnode_t.h" +#include "irmode_t.h" +#include "irprog_t.h" #include "irgwalk.h" #include "ircons.h" #include "irgmod.h" -#include "irnode_t.h" -#include "irflag_t.h" +#include "irflag_t.h" #include "dbginfo_t.h" +#include "iropt_dbg.h" + +#include "eset.h" +#include "pmap.h" +#include "array.h" #include "irdump.h" +#include "irhooks.h" + /* Eindeutige Adresse zur Markierung von besuchten Knoten und zur * Darstellung der unbekannten Methode. */ static void * MARK = &MARK; @@ -52,7 +61,7 @@ static eset * entities = NULL; /** Bestimmt die eindeutige Methode, die die Methode für den - * übergebenen (dynamischen) Typ überschreibt. */ + * übergebenen (dynamischen) Typ überschreibt. */ static entity * get_implementation(type * class, entity * method) { int i; if (get_entity_peculiarity(method) != peculiarity_description && @@ -78,24 +87,38 @@ static entity * get_implementation(type * class, entity * method) { /** Returns the entity that contains the implementation of the inherited entity if available, else returns the entity passed. */ static entity *get_inherited_methods_implementation(entity *inh_meth) { + assert(get_atomic_ent_value(inh_meth) && "constant entity without value"); + assert((get_irn_op(get_atomic_ent_value(inh_meth)) == op_SymConst) && + (get_SymConst_kind(get_atomic_ent_value(inh_meth)) == symconst_addr_ent) && + "Complex constant values not supported -- address of method should be straight constant!"); + + return get_SymConst_entity(get_atomic_ent_value(inh_meth)); + +#if 0 // this stuff is outdated, I think. GL 10.11.04 entity *impl_meth = NULL; ir_node *addr = get_atomic_ent_value(inh_meth); - assert(addr && "constant entity without value"); - if (get_irn_op(addr) == op_Const) { - impl_meth = tarval_to_entity(get_Const_tarval(addr)); + assert(get_atomic_ent_value(inh_meth) && "constant entity without value"); + + if ((get_irn_op(addr) == op_SymConst) && + (get_SymConst_kind(addr) == symconst_addr_ent)) { + impl_meth = get_SymConst_entity(addr); } else { assert(0 && "Complex constant values not supported -- address of method should be straight constant!"); } + if (impl_meth && (get_entity_peculiarity(impl_meth) != peculiarity_existent)) { /* printf("this_meth: "); DDMEO(inh_meth); printf("impl meth: "); DDMEO(impl_meth); assert(!impl_meth || get_entity_peculiarity(impl_meth) == peculiarity_existent); */ + assert(0); impl_meth = NULL; } + assert((impl_meth || inh_meth) && "no implementation for inherited entity"); return impl_meth? impl_meth : inh_meth; +#endif } @@ -114,10 +137,14 @@ static entity *get_inherited_methods_implementation(entity *inh_meth) { */ static void collect_impls(entity *method, eset *set, int *size, bool *open) { int i; + entity *impl; +#if 0 if (get_entity_peculiarity(method) == peculiarity_existent) { - if (get_entity_visibility(method) == visibility_external_allocated) { - assert(get_entity_irg(method) == NULL); + if ((get_entity_visibility(method) == visibility_external_allocated) + && (NULL == get_entity_irg(method))) { + /* We could also add these entities to the callees, but right now we + subsume them by unknown_entity. */ *open = true; } else { assert(get_entity_irg(method) != NULL); @@ -130,7 +157,6 @@ static void collect_impls(entity *method, eset *set, int *size, bool *open) { if (get_entity_peculiarity(method) == peculiarity_inherited) { entity *impl_ent = get_inherited_methods_implementation(method); - assert(impl_ent && "no implementation for inherited entity"); if (get_entity_visibility(impl_ent) == visibility_external_allocated) { assert(get_entity_irg(impl_ent) == NULL); *open = true; @@ -142,7 +168,49 @@ static void collect_impls(entity *method, eset *set, int *size, bool *open) { } } } - /** recursive descend **/ +#endif + /* Only the assertions: */ + if (get_entity_peculiarity(method) == peculiarity_existent) { + if ((get_entity_visibility(method) == visibility_external_allocated) + && (NULL == get_entity_irg(method))) { + } else { + assert(get_entity_irg(method) != NULL); + } + } + if (get_entity_peculiarity(method) == peculiarity_inherited) { + entity *impl_ent = get_inherited_methods_implementation(method); + if (get_entity_visibility(impl_ent) == visibility_external_allocated) { + assert(get_entity_irg(impl_ent) == NULL); + } else { + assert(get_entity_irg(impl_ent) != NULL); + } + } + + /* Add the implementation to the set if it contains an irg, else + remember that there are more methods called. */ + /* @@@ We could also add unknown_entity, or the entities with the + unknown irgs. The first case would result in the exact same + behavior: all unknown irgs are represented by the one and only + unknown entity. If we add all entities, we known the number of + entities possibly called, and whether there are real unknown + entities, i.e, such not represented in the type description. + This would be better for an analysis: it could rule out more + cases. */ + impl = method; + if (get_entity_peculiarity(method) == peculiarity_inherited) + impl = get_inherited_methods_implementation(method); + + if (get_entity_peculiarity(method) != peculiarity_description) { + //if (get_entity_irg(impl)) { + eset_insert(set, impl); + ++(*size); + //} else { + /* GL: better: eset_insert(set, unknown_entity); */ + //*open = true; + //} + } + + /*- recursive descent -*/ for (i = get_entity_n_overwrittenby(method) - 1; i >= 0; --i) collect_impls(get_entity_overwrittenby(method, i), set, size, open); } @@ -187,79 +255,63 @@ static entity ** get_impl_methods(entity * method) { return arr; } - -/* debug makros used in sel_methods_walker */ -#define SIZ(x) sizeof(x)/sizeof((x)[0]) - -#define DBG_OPT_NORMALIZE \ - __dbg_info_merge_pair(new_node, node, dbg_const_eval) -#define DBG_OPT_POLY_ALLOC \ - do { \ - ir_node *ons[2]; \ - ons[0] = node; \ - ons[1] = skip_Proj(get_Sel_ptr(node)); \ - __dbg_info_merge_sets(&new_node, 1, ons, SIZ(ons), dbg_rem_poly_call); \ - } while(0) -#define DBG_OPT_POLY \ - __dbg_info_merge_pair(new_node, node, dbg_rem_poly_call) - - - -/** Analyse address computations. +/** Analyze address computations. * - * - If the node is a SymConst replace it by Const(ent) if possible. + * - If the node is a SymConst(name) replace it by SymConst(ent) if possible. * - If the node is a Sel: * * If the pointer to the Sel comes directly from an Alloc node - * replace the Sel by a Const(ent). + * replace the Sel by a SymConst(ent). * * * @param node The node to analyze - * @param ldname_map A map that mapps names of entities to the entities. + * @param env A map that maps names of entities to the entities. */ -static void sel_methods_walker(ir_node * node, pmap * ldname_map) { +static void sel_methods_walker(ir_node * node, void *env) { + pmap *ldname_map = env; + /* replace SymConst(name)-operations by SymConst(ent) */ if (get_irn_op(node) == op_SymConst) { - /* Wenn möglich SymConst-Operation durch Const-Operation - * ersetzen. */ - if (get_SymConst_kind(node) == linkage_ptr_info) { - pmap_entry *entry = pmap_find(ldname_map, (void *) get_SymConst_ptrinfo(node)); + if (get_SymConst_kind(node) == symconst_addr_name) { + pmap_entry * entry = pmap_find(ldname_map, (void *) get_SymConst_name(node)); if (entry != NULL) { /* Method is declared in the compiled code */ - entity *ent = entry->value; - if (get_opt_normalize() && (get_entity_visibility(ent) != visibility_external_allocated)) { - /* Meth. is defined */ + entity * ent = entry->value; + if (get_opt_normalize() && (get_entity_visibility(ent) != visibility_external_allocated)) { /* Meth. is defined */ ir_node *new_node; - assert(get_entity_irg(ent)); - set_irg_current_block(current_ir_graph, get_nodes_Block(node)); - new_node = new_d_Const(get_irn_dbg_info(node), - mode_P_mach, new_tarval_from_entity(ent, mode_P_mach)); DBG_OPT_NORMALIZE; - exchange(node, new_node); - } + + set_irg_current_block(current_ir_graph, get_nodes_block(node)); + new_node = copy_const_value(get_atomic_ent_value(ent)); + + DBG_OPT_CSTEVAL(node, new_node); + + assert(get_entity_irg(ent)); + DDMN(new_node); + exchange(node, new_node); + } } } - } else if (get_irn_op(node) == op_Sel && - is_method_type(get_entity_type(get_Sel_entity(node)))) { + } + else if (get_irn_op(node) == op_Sel && + is_Method_type(get_entity_type(get_Sel_entity(node)))) { entity * ent = get_Sel_entity(node); + + /* Sel from Alloc: replace by constant */ if (get_opt_optimize() && get_opt_dyn_meth_dispatch() && (get_irn_op(skip_Proj(get_Sel_ptr(node))) == op_Alloc)) { ir_node *new_node; entity *called_ent; + /* We know which method will be called, no dispatch necessary. */ -#if 0 - assert(get_entity_peculiarity(ent) != peculiarity_description); - set_irg_current_block(current_ir_graph, get_nodes_Block(node)); - /* @@@ Is this correct?? Alloc could reference a subtype of the owner - of Sel that overwrites the method referenced in Sel. */ - /* @@@ Yes, this is wrong. GL, 10.3.04 */ - new_node = copy_const_value(get_atomic_ent_value(ent)); DBG_OPT_POLY_ALLOC; -#else called_ent = resolve_ent_polymorphy(get_Alloc_type(skip_Proj(get_Sel_ptr(node))), ent); - set_irg_current_block(current_ir_graph, get_nodes_Block(node)); + set_irg_current_block(current_ir_graph, get_nodes_block(node)); + /* called_ent may not be description: has no Address/Const to Call! */ assert(get_entity_peculiarity(called_ent) != peculiarity_description); - new_node = copy_const_value(get_atomic_ent_value(called_ent)); DBG_OPT_POLY_ALLOC; -#endif - exchange (node, new_node); - } else { + new_node = copy_const_value(get_atomic_ent_value(called_ent)); + + DBG_OPT_POLY_ALLOC(node, new_node); + exchange(node, new_node); + } + else { assert(get_entity_peculiarity(ent) != peculiarity_inherited); if (!eset_contains(entities, ent)) { /* Entity noch nicht behandelt. Alle (intern oder extern) @@ -275,15 +327,11 @@ static void sel_methods_walker(ir_node * node, pmap * ldname_map) { /* Gib eine Warnung aus wenn die Entitaet eine Beschreibung ist fuer die es keine Implementierung gibt. */ if (get_entity_peculiarity(ent) == peculiarity_description) { - /* @@@ GL Methode um Fehler anzuzeigen aufrufen! */ - printf("WARNING: Calling method description %s\n in method %s\n of class %s\n which has " - "no implementation!\n", get_entity_name(ent), - get_entity_name(get_irg_ent(current_ir_graph)), - get_type_name(get_entity_owner(get_irg_ent(current_ir_graph)))); - printf("This happens when compiling a Java Interface that's never really used, i.e., " - "no class implementing the interface is ever used.\n"); + /* This is possible: We call a method in a dead part of the program. */ } else { - exchange(node, new_Bad()); + DDMN(node); + assert(0); /* Why should this happen ??? */ + //exchange(node, new_Bad()); } } else { entity ** arr = get_entity_link(ent); @@ -291,7 +339,7 @@ static void sel_methods_walker(ir_node * node, pmap * ldname_map) { #if 0 int i; printf("\nCall site "); DDMN(node); - printf(" in "); DDME(get_irg_ent(current_ir_graph)); + printf(" in "); DDME(get_irg_entity(current_ir_graph)); printf(" can call:\n"); for (i = 0; i < ARR_LEN(arr); i++) { printf(" - "); DDME(arr[i]); @@ -303,13 +351,15 @@ static void sel_methods_walker(ir_node * node, pmap * ldname_map) { if (get_opt_optimize() && get_opt_dyn_meth_dispatch() && (ARR_LEN(arr) == 1 && arr[0] != NULL)) { ir_node *new_node; - /* Die Sel-Operation kann immer nur einen Wert auf eine + /* Die Sel-Operation kann immer nur _einen_ Wert auf eine * interne Methode zurückgeben. Wir können daher die * Sel-Operation durch eine Const- bzw. SymConst-Operation * ersetzen. */ - set_irg_current_block(current_ir_graph, get_nodes_Block(node)); - /* assert(get_entity_peculiarity(tarval_to_entity(get_Const_tarval(get_atomic_ent_value(arr[0])))) == peculiarity_existent); */ - new_node = copy_const_value(get_atomic_ent_value(arr[0])); DBG_OPT_POLY; + set_irg_current_block(current_ir_graph, get_nodes_block(node)); + assert(get_entity_peculiarity(get_SymConst_entity(get_atomic_ent_value(arr[0]))) == + peculiarity_existent); + new_node = copy_const_value(get_atomic_ent_value(arr[0])); + DBG_OPT_POLY(node, new_node); exchange (node, new_node); } } @@ -319,28 +369,30 @@ static void sel_methods_walker(ir_node * node, pmap * ldname_map) { /** Datenstruktur initialisieren. Zusätzlich werden alle - * SymConst-Operationen, die auf interne Methoden verweisen, durch - * Const-Operationen ersetzt. */ + * SymConst(name)-Operationen, die auf interne Methoden verweisen, durch + * SymConst(entity)-Operationen ersetzt. */ static void sel_methods_init(void) { int i; - pmap * ldname_map = pmap_create(); /* Map entitiy names to entities: to replace SymConst by Const(ent). */ + pmap * ldname_map = pmap_create(); /* Map entity names to entities: to replace SymConst(name) by SymConst(ent). */ + assert(entities == NULL); entities = eset_create(); for (i = get_irp_n_irgs() - 1; i >= 0; --i) { - entity * ent = get_irg_ent(get_irp_irg(i)); - /* Nur extern sichtbare Methode können überhaupt mit SymConst + ir_graph *irg = get_irp_irg(i); + entity * ent = get_irg_entity(irg); + /* Nur extern sichtbare Methoden können überhaupt mit SymConst * aufgerufen werden. */ if (get_entity_visibility(ent) != visibility_local) { pmap_insert(ldname_map, (void *) get_entity_ld_ident(ent), ent); } } - all_irg_walk((irg_walk_func *) sel_methods_walker, NULL, ldname_map); + all_irg_walk(sel_methods_walker, NULL, ldname_map); pmap_destroy(ldname_map); } /*****************************************************************************/ -/* Datenstruktur freigeben. */ +/** Frees the allocated entity map */ static void sel_methods_dispose(void) { entity * ent; assert(entities); @@ -356,16 +408,18 @@ static void sel_methods_dispose(void) { } -/* Gibt die Menge aller Methoden zurück, die an diesem Sel-Knoten - * zurückgegeben werden können. Die Liste enthält keine doppelten - * Einträge. */ +/** + * Returns an array of all methods that could be called at a Sel node. + * This array contains every entry only once. + */ static entity ** get_Sel_arr(ir_node * sel) { static entity ** NULL_ARRAY = NULL; entity * ent; entity ** arr; + assert(sel && get_irn_op(sel) == op_Sel); ent = get_Sel_entity(sel); - assert(is_method_type(get_entity_type(ent))); /* what else? */ + assert(is_Method_type(get_entity_type(ent))); /* what else? */ arr = get_entity_link(ent); if (arr) { return arr; @@ -379,12 +433,16 @@ static entity ** get_Sel_arr(ir_node * sel) { } } - +/** + * Returns the number of possible called methods at a Sel node. + */ static int get_Sel_n_methods(ir_node * sel) { return ARR_LEN(get_Sel_arr(sel)); } - +/** + * Returns the ith possible called method entity at a Sel node. + */ static entity * get_Sel_method(ir_node * sel, int pos) { entity ** arr = get_Sel_arr(sel); assert(pos >= 0 && pos < ARR_LEN(arr)); @@ -415,9 +473,9 @@ static void callee_ana_proj(ir_node * node, long n, eset * methods) { ir_node * pred = get_Proj_pred(node); if (get_irn_link(pred) != MARK) { if (get_irn_op(pred) == op_Tuple) { - callee_ana_proj(get_Tuple_pred(pred, get_Proj_proj(node)), n, methods); + callee_ana_proj(get_Tuple_pred(pred, get_Proj_proj(node)), n, methods); } else { - eset_insert(methods, MARK); /* free method -> unknown */ + eset_insert(methods, MARK); /* free method -> unknown */ } } break; @@ -453,26 +511,16 @@ static void callee_ana_node(ir_node * node, eset * methods) { switch (get_irn_opcode(node)) { case iro_SymConst: - /* externe Methode (wegen fix_symconst!) */ - eset_insert(methods, MARK); /* free method -> unknown */ - break; - - case iro_Const: { - /* interne Methode */ - entity * ent = tarval_to_entity(get_Const_tarval(node)); - assert(ent && is_method_type(get_entity_type(ent))); - if (get_entity_visibility(ent) != visibility_external_allocated) { - if (!get_entity_irg(ent)) { - dump_entity(ent); - assert(get_entity_irg(ent)); - } + if (get_SymConst_kind(node) == symconst_addr_ent) { + entity * ent = get_SymConst_entity(node); + assert(ent && is_Method_type(get_entity_type(ent))); eset_insert(methods, ent); } else { + assert(get_SymConst_kind(node) == symconst_addr_name); + /* externe Methode (wegen fix_symconst!) */ eset_insert(methods, MARK); /* free method -> unknown */ } break; - } - case iro_Sel: /* polymorphe Methode */ for (i = get_Sel_n_methods(node) - 1; i >= 0; --i) { @@ -524,32 +572,42 @@ static void callee_walker(ir_node * call, void * env) { eset * methods = eset_create(); entity * ent; entity ** arr = NEW_ARR_F(entity *, 0); - callee_ana_node(skip_nop(get_Call_ptr(call)), methods); + assert(get_irn_op(get_Call_ptr(call)) != op_Id); + callee_ana_node(get_Call_ptr(call), methods); if (eset_contains(methods, MARK)) { /* unknown method */ - ARR_APP1(entity *, arr, NULL); + ARR_APP1(entity *, arr, unknown_entity); } for (ent = eset_first(methods); ent; ent = eset_next(methods)) { if (ent != MARK) { - ARR_APP1(entity *, arr, ent); + ARR_APP1(entity *, arr, ent); } } - if (ARR_LEN(arr) == 0) { +#if 0 /* This generates Bad nodes when we don't want it. + Call it with a check for valid cgana information in local_optimize. */ + if (ARR_LEN(arr) == 0 && get_opt_optimize() && get_opt_dyn_meth_dispatch()) { /* Kann vorkommen, wenn der Vorgänger beispielsweise eine * Sel-Operation war, die keine Methoden zurückgeben * konnte. Wir ersetzen die Call-Operation ebenfalls durch * eine Bad-Operation. Die Verlinkung muss wiederhergestellt * werden! */ - /* exchange(call, new_Bad()); invalid firm */ - ir_node *mem = get_Call_mem(call); turn_into_tuple (call, 5 /* pn_Call_max */); set_Tuple_pred(call, pn_Call_M_regular , mem); set_Tuple_pred(call, pn_Call_T_result , new_Bad()); set_Tuple_pred(call, pn_Call_P_value_res_base, new_Bad()); set_Tuple_pred(call, pn_Call_X_except , new_Bad()); /* new_Jmp() ?? new_Raise() ?? */ - set_Tuple_pred(call, pn_Call_M_except , mem); + set_Tuple_pred(call, pn_Call_M_except , new_Bad()); + + } else +#endif + { + /* remove, what we repaired. */ + int i; + for (i = 0; i < ARR_LEN(arr); ++i) { + assert(arr[i]); + //if (arr[i] == unknown_entity) arr[i] = NULL; + } - } else { set_Call_callee_arr(call, ARR_LEN(arr), arr); } DEL_ARR_F(arr); @@ -558,6 +616,15 @@ static void callee_walker(ir_node * call, void * env) { } +static void remove_Tuples(ir_node * proj, void * env) { + ir_node *new; + if (get_irn_opcode(proj) != iro_Proj) return; + + new = skip_Tuple(proj); + if (new != proj) exchange(proj, new); +} + + /* Bestimmt für jede Call-Operation die Menge der aufrufbaren Methode * und speichert das Ergebnis in der Call-Operation. (siehe * "set_Call_callee"). "sel_methods" wird für den Aufbau benötigt und @@ -566,9 +633,10 @@ static void callee_ana(void) { int i; /* Alle Graphen analysieren. */ for (i = get_irp_n_irgs() - 1; i >= 0; --i) { - irg_walk_graph(get_irp_irg(i), callee_walker, NULL, NULL); + irg_walk_graph(get_irp_irg(i), callee_walker, remove_Tuples, NULL); set_irg_callee_info_state(get_irp_irg(i), irg_callee_info_consistent); } + set_irp_callee_info_state(irg_callee_info_consistent); } @@ -624,7 +692,7 @@ static void free_mark_proj(ir_node * node, long n, eset * set) { static void free_mark(ir_node * node, eset * set) { int i; - assert(mode_is_reference(get_irn_mode(node))); + if (get_irn_link(node) == MARK) { return; /* already visited */ } @@ -632,26 +700,25 @@ static void free_mark(ir_node * node, eset * set) { switch (get_irn_opcode(node)) { case iro_Sel: { entity * ent = get_Sel_entity(node); - if (is_method_type(get_entity_type(ent))) { + if (is_Method_type(get_entity_type(ent))) { for (i = get_Sel_n_methods(node) - 1; i >= 0; --i) { - eset_insert(set, get_Sel_method(node, i)); + eset_insert(set, get_Sel_method(node, i)); } } break; } case iro_SymConst: - /* nothing: SymConst points to extern method */ - break; - case iro_Const: { - tarval * val = get_Const_tarval(node); - if (tarval_is_entity(val)) { /* filter null pointer */ - entity * ent = tarval_to_entity(val); - if (is_method_type(get_entity_type(ent))) { + if (get_SymConst_kind(node) == symconst_addr_ent) { + entity * ent = get_SymConst_entity(node); + if (is_Method_type(get_entity_type(ent))) { eset_insert(set, ent); } + } else { + assert(get_SymConst_kind(node) == symconst_addr_name); + /* nothing: SymConst points to extern method */ } break; - } + case iro_Phi: for (i = get_Phi_n_preds(node) - 1; i >= 0; --i) { free_mark(get_Phi_pred(node, i), set); @@ -695,7 +762,7 @@ static void free_ana_walker(ir_node * node, eset * set) { for (i = get_Call_arity(node) - 1; i >= 0; --i) { ir_node * pred = get_Call_param(node, i); if (mode_is_reference(get_irn_mode(pred))) { - free_mark(pred, set); + free_mark(pred, set); } } break; @@ -706,7 +773,7 @@ static void free_ana_walker(ir_node * node, eset * set) { for (i = get_irn_arity(node) - 1; i >= 0; --i) { ir_node * pred = get_irn_n(node, i); if (mode_is_reference(get_irn_mode(pred))) { - free_mark(pred, set); + free_mark(pred, set); } } break; @@ -720,7 +787,8 @@ static void free_ana_walker(ir_node * node, eset * set) { * SymConst-Operationen müssen in passende Const-Operationen * umgewandelt worden sein, d.h. SymConst-Operationen verweisen immer * auf eine echt externe Methode. */ -static entity ** get_free_methods(void) { +static entity ** get_free_methods(void) +{ eset * set = eset_create(); int i; entity ** arr = NEW_ARR_F(entity *, 0); @@ -728,7 +796,7 @@ static entity ** get_free_methods(void) { for (i = get_irp_n_irgs() - 1; i >= 0; --i) { ir_graph * irg = get_irp_irg(i); - entity * ent = get_irg_ent(irg); + entity * ent = get_irg_entity(irg); /* insert "external visible" methods. */ if (get_entity_visibility(ent) != visibility_local) { eset_insert(set, ent); @@ -737,10 +805,21 @@ static entity ** get_free_methods(void) { z.B. da die Adresse einer Methode abgespeichert wird. */ irg_walk_graph(irg, NULL, (irg_walk_func *) free_ana_walker, set); } + + /* insert sticky methods, too */ + for (i = get_irp_n_irgs() - 1; i >= 0; --i) { + ir_graph * irg = get_irp_irg(i); + entity * ent = get_irg_entity(irg); + /* insert "external visible" methods. */ + if (get_entity_stickyness (ent) == stickyness_sticky) { + eset_insert(set, ent); + } + } + /* Hauptprogramm ist auch dann frei, wenn es nicht "external * visible" ist. */ if (get_irp_main_irg()) { - eset_insert(set, get_irg_ent(get_irp_main_irg())); + eset_insert(set, get_irg_entity(get_irp_main_irg())); } /* Wandle Menge in Feld um. Effizienter. */ for (ent = eset_first(set); ent; ent = eset_next(set)) { @@ -752,8 +831,7 @@ static entity ** get_free_methods(void) { } void cgana(int *length, entity ***free_methods) { - entity ** free_meths; - int i; + entity ** free_meths, **p; sel_methods_init(); free_meths = get_free_methods(); @@ -762,9 +840,12 @@ void cgana(int *length, entity ***free_methods) { /* Convert the flexible array to an array that can be handled by standard C. */ - *length = ARR_LEN(free_meths); - *free_methods = (entity **)malloc(sizeof(entity *) * (*length)); - for (i = 0; i < (*length); i++) (*free_methods)[i] = free_meths[i]; + p = xmalloc(sizeof(*p) * ARR_LEN(free_meths)); + memcpy(p, free_meths, ARR_LEN(free_meths) * sizeof(*p)); + + *length = ARR_LEN(free_meths); + *free_methods = p; + DEL_ARR_F(free_meths); } @@ -799,20 +880,4 @@ void free_callee_info(ir_graph *irg) { void opt_call_addrs(void) { sel_methods_init(); sel_methods_dispose(); -#if 0 - int i; - pmap * ldname_map = pmap_create(); - assert(entities == NULL); - entities = eset_create(); - for (i = get_irp_n_irgs() - 1; i >= 0; --i) { - entity * ent = get_irg_ent(get_irp_irg(i)); - /* Nur extern sichtbare Methoden können überhaupt mit SymConst - * aufgerufen werden. */ - if (get_entity_visibility(ent) != local) { - pmap_insert(ldname_map, (void *) get_entity_ld_ident(ent), ent); - } - } - all_irg_walk((irg_walk_func *) sel_methods_walker, NULL, ldname_map); - pmap_destroy(ldname_map); -#endif }