bugfix: missing test for new symconst

[libfirm] / ir / ana / rta.c

diff --git a/ir/ana/rta.c b/ir/ana/rta.c
index 80fcc43..3728f80 100644 (file)
--- a/ir/ana/rta.c
+++ b/ir/ana/rta.c
@@ -9,13 +9,13 @@
  * Created:     09.06.2002
  * CVS-ID:      $$
  * Copyright:   (c) 1999-2004 Universität Karlsruhe
- * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
+ * Licence:     This file is protected by GPL -  GNU GENERAL PUBLIC LICENSE.
  */
 
 /**
  * Intraprozedurale Analyse zur Abschätzung der Aufrufrelation. Es
- * die Menge der instantiierten Klassen bestimmt, und daraus existierende Methoden
- * bestimmt.
+ * die Menge der instantiierten Klassen bestimmt, und daraus eine Abschätzung
+ * der aufgerufenen Methoden bestimmt.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -27,7 +27,7 @@
 #include <stdlib.h>
 
 #include "irnode_t.h"
-#include "irprog.h"
+#include "irprog_t.h"
 
 #include "eset.h"
 #include "irgwalk.h"
@@ -163,12 +163,26 @@ static void rta_act (ir_node *node, void *env)
       if (graph) {
         *change = add_graph (graph);
       } else {
-        /* it's an externally allocated thing. */
+        /* it's an external allocated thing. */
       }
     } else if (iro_SymConst == get_irn_opcode (ptr)) { /* CALL SYMCONST */
+      if (get_SymConst_kind(ptr) == symconst_addr_ent) {
+       ent = get_SymConst_entity (ptr);
+       ir_graph *graph = get_entity_irg (ent);
+       /* don't use get_implementing_graph on a SymConst! */
+       if (graph) {
+         *change = add_graph (graph);
+       } else {
+         /* it's an external allocated thing. */
+       }
+      } else if (get_SymConst_kind(ptr) == symconst_addr_name) {
       /* If this SymConst refers to a method the method is external_visible
          and therefore must be considered live anyways. */
       /* assert (ent && "couldn't determine entity of call to symConst"); */
+      } else {
+       /* other symconst. */
+      }
+
     }
   } else if (iro_Alloc == op) { /* ALLOC */
     type *type = get_Alloc_type (node);
@@ -298,8 +312,7 @@ static void force_description (entity *ent, entity *addr)
 
     if (peculiarity_inherited == get_entity_peculiarity (over)) {
       /* We rely on the fact that cse is performed on the const_code_irg. */
-      entity *my_addr =
-        tarval_to_entity(get_Const_tarval(get_atomic_ent_value(over)));
+      entity *my_addr = get_SymConst_entity(get_atomic_ent_value(over));
 
       if (addr == my_addr) {
         force_description (over, addr);
@@ -307,9 +320,9 @@ static void force_description (entity *ent, entity *addr)
     } else if (peculiarity_existent == get_entity_peculiarity (over)) {
       /* check whether 'over' forces 'inheritance' of *our* graph: */
       ir_node *f_addr = get_atomic_ent_value (over);
-      entity *impl_ent = tarval_to_entity (get_Const_tarval (f_addr));
+      entity *impl_ent = get_SymConst_entity (f_addr);
 
-      assert ((get_irn_op(f_addr) == op_Const) && "can't do complex addrs");
+      assert ((get_irn_op(f_addr) == op_SymConst) && "can't do complex addrs");
       if (impl_ent == addr) {
         assert (0 && "gibt's denn sowas");
         force_description (over, addr);
@@ -370,6 +383,8 @@ static void init_tables (void)
     eset_insert (_live_graphs, get_irp_main_irg ());
   }
 
+  /* Adding the GlobalType is pointless, since its methods are always
+     called via a constant */
   /*
   if (get_glob_type ()) {
     eset_insert (_live_classes, get_glob_type ());
@@ -529,6 +544,18 @@ void rta_report (void)
 
 /*
  * $Log$
+ * Revision 1.21  2004/07/08 15:50:56  goetz
+ * firmstat added
+ *
+ * Revision 1.20  2004/07/08 11:17:40  goetz
+ * *** empty log message ***
+ *
+ * Revision 1.19  2004/07/06 12:30:37  beyhan
+ * new SymConst semantics
+ *
+ * Revision 1.18  2004/06/27 21:17:41  liekweg
+ * Added comment
+ *
  * Revision 1.17  2004/06/25 13:45:13  liekweg
  * observe stickyness; minor refactoring
  *