Fixed 'inline' lossage --flo

[libfirm] / ir / ana / cgana.c

diff --git a/ir/ana/cgana.c b/ir/ana/cgana.c
index a750e02..967d392 100644 (file)
--- a/ir/ana/cgana.c
+++ b/ir/ana/cgana.c
@@ -16,6 +16,9 @@
  * Call-Operationen aufrufbaren Methoden bestimmt.
  *
  */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 
 #include <stdlib.h>
 #include "cgana.h"
@@ -29,7 +32,7 @@
 #include "ircons.h"
 #include "irgmod.h"
 #include "irnode.h"
-#include "irflag.h"
+#include "irflag_t.h"
 
 #include "dbginfo_t.h"
 
@@ -206,15 +209,25 @@ static void sel_methods_walker(ir_node * node, pmap * ldname_map) {
   } 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_optimize() && get_opt_dyn_meth_dispatch() &&
+    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));
+      /* 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 {
       assert(get_entity_peculiarity(ent) != peculiarity_inherited);
@@ -254,7 +267,7 @@ static void sel_methods_walker(ir_node * node, pmap * ldname_map) {
        printf("\n");
 #endif
 
-       if (get_optimize() && get_opt_dyn_meth_dispatch() &&
+       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
@@ -508,6 +521,7 @@ static void callee_ana(void) {
   /* Alle Graphen analysieren. */
   for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
     irg_walk_graph(get_irp_irg(i), callee_walker, NULL, NULL);
+    set_irg_callee_info_state(get_irp_irg(i), irg_callee_info_consistent);
   }
 }