-/* Eindeutige Adresse zur Markierung von besuchten Knoten und zur
- * Darstellung der unbekannten Methode. */
+/* unambiguous address used as a mark. */
static void *MARK = &MARK;
static eset *entities = NULL;
}
/** Collect the entity representing the implementation of this
- * entity (not the same if inherited) and all entities for overwriting
+ * method (not the same if inherited) and all entities for overwriting
* implementations in "set".
* If the implementation of the method is not included in the
* compilation unit "open" is set to true.
* @param size Number of entities in set.
* @param open
*/
-static void collect_impls(entity *method, eset *set, int *size, bool *open) {
+static void collect_impls(entity *method, eset *set, int *size, int *open) {
int i;
entity *impl;
eset * set = eset_create();
int size = 0;
entity ** arr;
- bool open = false;
+ int open = 0;
/* Collect all method entities that can be called here */
collect_impls(method, set, &size, &open);
entity **arr;
/* Call standard optimizations */
- if (get_irn_op(node) == op_Sel) {
+ if (is_Sel(node)) {
ir_node *new_node = optimize_in_place(node);
- if (node != new_node) exchange(node, new_node);
+ if (node != new_node)
+ exchange(node, new_node);
}
/* replace SymConst(name)-operations by SymConst(ent) */
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]));
+ new_node = copy_const_value(get_irn_dbg_info(node), get_atomic_ent_value(arr[0]));
DBG_OPT_POLY(node, new_node);
exchange(node, new_node);
}
entity * ent;
entity ** arr;
- assert(sel && get_irn_op(sel) == op_Sel);
+ assert(is_Sel(sel));
ent = get_Sel_entity(sel);
ent = get_inherited_methods_implementation(ent);
/**
* Add all method addresses in global initializers to the set.
+ *
+ * @note
+ * We do NOT check the type here, just it it's an entity address.
+ * The reason for this is code like:
+ *
+ * void *p = function;
+ *
+ * which is sometimes used to anchor functions.
*/
static void add_method_address(entity *ent, eset *set)
{
ir_node *n;
- type *tp;
+ ir_type *tp;
int i;
/* do not check uninitialized values */
if (is_atomic_entity(ent)) {
tp = get_entity_type(ent);
- /* only function pointers are interesting */
- if (! is_Pointer_type(tp))
- return;
- if (! is_Method_type(get_pointer_points_to_type(tp)))
+ /* ignore methods: these of course reference it's address */
+ if (is_Method_type(tp))
return;
/* let's check if it's the address of a function */
if (get_SymConst_kind(n) == symconst_addr_ent) {
ent = get_SymConst_entity(n);
- eset_insert(set, ent);
+ if (is_Method_type(get_entity_type(ent)))
+ eset_insert(set, ent);
}
}
}
if (get_SymConst_kind(n) == symconst_addr_ent) {
entity *ent = get_SymConst_entity(n);
- eset_insert(set, ent);
+ if (is_Method_type(get_entity_type(ent)))
+ eset_insert(set, ent);
}
}
}
entity **arr = NEW_ARR_F(entity *, 0);
entity *ent;
ir_graph *irg;
- type *glob;
+ ir_type *glob;
for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
irg = get_irp_irg(i);
set_irn_link(node, MARK);
switch (get_irn_opcode(node)) {
+ case iro_Const:
+ /* A direct address call. We tread this as an external
+ call and ignore it completely. */
+ eset_insert(methods, MARK); /* free method -> unknown */
+ break;
case iro_SymConst:
if (get_SymConst_kind(node) == symconst_addr_ent) {
entity * ent = get_SymConst_entity(node);
/* */
static void callee_walker(ir_node * call, void * env) {
- if (get_irn_op(call) == op_Call) {
+ if (is_Call(call)) {
eset * methods = eset_create();
entity * ent;
entity ** arr = NEW_ARR_F(entity *, 0);
int i;
/* Alle Graphen analysieren. */
for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
- 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);
+ ir_graph *irg = get_irp_irg(i);
+ irg_walk_graph(irg, callee_walker, remove_Tuples, NULL);
+ set_irg_callee_info_state(irg, irg_callee_info_consistent);
}
set_irp_callee_info_state(irg_callee_info_consistent);
}
/*--------------------------------------------------------------------------*/
static void destruct_walker(ir_node * node, void * env) {
- if (get_irn_op(node) == op_Call) {
+ if (is_Call(node)) {
remove_Call_callee_arr(node);
}
}