-/* 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);
/* Call standard optimizations */
if (get_irn_op(node) == op_Sel) {
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);
}
/**
* 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)
{
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);
}
}
}