#include "irgwalk.h"
#include "ircons.h"
#include "irgmod.h"
-#include "xprintf.h"
#include "irnode.h"
+#include "irflag.h"
+
+#include "dbginfo_t.h"
/* Eindeutige Adresse zur Markierung von besuchten Knoten und zur
* Darstellung der unbekannten Methode. */
assert(addr && "constant entity without value");
if (get_irn_op(addr) == op_Const) {
- impl_meth = get_tv_entity(get_Const_tarval(addr));
+ impl_meth = tarval_to_entity(get_Const_tarval(addr));
}
assert(!impl_meth || get_entity_peculiarity(impl_meth) == existent);
}
-/* A recursive descend in the overwritten relation.
+/* Collect the entity representing the implementation of this
+ entity (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.
+ A recursive descend in the overwritten relation.
Cycle-free, therefore must terminate. */
void collect_impls(entity *method, eset *set, int *size, bool *open) {
int i;
/** Collect all method entities that can be called here **/
collect_impls(method, set, &size, &open);
- /** Gefunden Entitaeten in ein Feld kopieren, ev. Unbekannten
+/**
Vorgaenger einfuegen. **/
if (size == 0 && !open) {
/* keine implementierte überschriebene Methode */
}
+/* 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)
+
+
static void sel_methods_walker(ir_node * node, pmap * ldname_map) {
if (get_irn_op(node) == op_SymConst) {
/* Wenn möglich SymConst-Operation durch Const-Operation
pmap_entry * entry = pmap_find(ldname_map, (void *) get_SymConst_ptrinfo(node));
if (entry != NULL) { /* Method is declared in the compiled code */
entity * ent = entry->value;
- if (get_entity_visibility(ent) != external_allocated) { /* Meth. is defined */
+ if (get_opt_normalize() && (get_entity_visibility(ent) != 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));
- exchange(node, new_d_Const(get_irn_dbg_info(node),
- mode_p, tarval_p_from_entity(ent)));
+ new_node = new_d_Const(get_irn_dbg_info(node),
+ mode_P, new_tarval_from_entity(ent, mode_P)); DBG_OPT_NORMALIZE;
+ exchange(node, new_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);
- if (get_irn_op(skip_Proj(get_Sel_ptr(node))) == op_Alloc) {
+ if (get_optimize() && get_opt_dyn_meth_dispatch() &&
+ (get_irn_op(skip_Proj(get_Sel_ptr(node))) == op_Alloc)) {
+ ir_node *new_node;
/* We know which method will be called, no dispatch necessary. */
assert(get_entity_peculiarity(ent) != description);
set_irg_current_block(current_ir_graph, get_nodes_Block(node));
- exchange (node, copy_const_value(get_atomic_ent_value(ent)));
+ /* @@@ Is this correct?? Alloc could reference a subtype of the owner
+ of Sel that overwrites the method referenced in Sel. */
+ new_node = copy_const_value(get_atomic_ent_value(ent)); DBG_OPT_POLY_ALLOC;
+ exchange (node, new_node);
} else {
assert(get_entity_peculiarity(ent) != inherited);
if (!eset_contains(entities, ent)) {
fuer die es keine Implementierung gibt. */
if (get_entity_peculiarity(ent) == description) {
/* @@@ GL Methode um Fehler anzuzeigen aufrufen! */
- xprintf("WARNING: Calling method description %I in method %I which has "
- "no implementation!\n", get_entity_ident(ent),
- get_entity_ident(get_irg_ent(current_ir_graph)));
+ printf("WARNING: Calling method description %s in method %s which has "
+ "no implementation!\n", id_to_str(get_entity_ident(ent)),
+ id_to_str(get_entity_ident(get_irg_ent(current_ir_graph))));
} else {
exchange(node, new_Bad());
}
printf("\n");
#endif
- if (ARR_LEN(arr) == 1 && arr[0] != NULL) {
+ if (get_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
* 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));
- exchange (node, copy_const_value(get_atomic_ent_value(arr[0])));
+ new_node = copy_const_value(get_atomic_ent_value(arr[0])); DBG_OPT_POLY;
+ exchange (node, new_node);
}
}
}
static void callee_ana_node(ir_node * node, eset * methods) {
int i;
- assert((get_irn_mode(node) == mode_p) || is_Bad(node));
+ assert((get_irn_mode(node) == mode_P) || is_Bad(node));
/* rekursion verhindern */
if (get_irn_link(node) == MARK) {
/* already visited */
case iro_Const: {
/* interne Methode */
- entity * ent = get_Const_tarval(node)->u.p.ent;
+ entity * ent = tarval_to_entity(get_Const_tarval(node));
assert(ent && is_method_type(get_entity_type(ent)));
if (get_entity_visibility(ent) != external_allocated) {
assert(get_entity_irg(ent));
static void free_mark(ir_node * node, eset * set) {
int i;
- assert(get_irn_mode(node) == mode_p);
+ assert(get_irn_mode(node) == mode_P);
if (get_irn_link(node) == MARK) {
return; /* already visited */
}
break;
case iro_Const: {
tarval * val = get_Const_tarval(node);
- entity * ent = val->u.p.ent;
- if (ent != NULL && is_method_type(get_entity_type(ent))) {
- eset_insert(set, ent);
+ if (tarval_is_entity(val)) { /* filter null pointer */
+ entity * ent = tarval_to_entity(val);
+ if (is_method_type(get_entity_type(ent))) {
+ eset_insert(set, ent);
+ }
}
break;
}
set_irn_link(node, MARK);
for (i = get_Call_arity(node) - 1; i >= 0; --i) {
ir_node * pred = get_Call_param(node, i);
- if (get_irn_mode(pred) == mode_p) {
+ if (get_irn_mode(pred) == mode_P) {
free_mark(pred, set);
}
}
set_irn_link(node, MARK);
for (i = get_irn_arity(node) - 1; i >= 0; --i) {
ir_node * pred = get_irn_n(node, i);
- if (get_irn_mode(pred) == mode_p) {
+ if (get_irn_mode(pred) == mode_P) {
free_mark(pred, set);
}
}
DEL_ARR_F(free_meths);
}
-/* Alle SymConst-Operationen, die auf interne Methoden verweisen,
+/* Optimize the address expressions passed to call nodes.
+ * Alle SymConst-Operationen, die auf interne Methoden verweisen,
* werden durch Const-Operationen ersetzt.
* Sel Knoten deren entitaeten nicht ueberschrieben werden, werden
* durch Const ersetzt.