optimize_graph_df():

[libfirm] / ir / ana / cgana.c

diff --git a/ir/ana/cgana.c b/ir/ana/cgana.c
index b4b0512..afa74dd 100644 (file)
--- a/ir/ana/cgana.c
+++ b/ir/ana/cgana.c
@@ -177,7 +177,7 @@ static void sel_methods_walker(ir_node * node, void *env) {
   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);
@@ -281,7 +281,7 @@ static entity ** get_Sel_arr(ir_node * sel) {
   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);
 
@@ -483,7 +483,7 @@ static void free_ana_walker(ir_node *node, void *env) {
 static void add_method_address(entity *ent, eset *set)
 {
   ir_node *n;
-  type *tp;
+  ir_type *tp;
   int i;
 
   /* do not check uninitialized values */
@@ -542,7 +542,7 @@ static entity ** get_free_methods(void)
   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);
@@ -646,6 +646,11 @@ static void callee_ana_node(ir_node * node, eset * methods) {
   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);
@@ -709,7 +714,7 @@ static void callee_ana_node(ir_node * node, eset * methods) {
 
 /* */
 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);
@@ -767,8 +772,9 @@ 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, 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);
 }
@@ -797,7 +803,7 @@ static void sel_methods_dispose(void) {
 /*--------------------------------------------------------------------------*/
 
 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);
   }
 }