X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Firtypeinfo.c;h=3ec3895f30b69a3613d0daf43697915ec6036f65;hb=ff0e8d7fcb34481652f0bf521ba04b1eca5e2106;hp=eba6da0133f5351df6032da9a5f58d16f0e34ae1;hpb=4a8e1e93a0641224e54ab8c5d1b84b57da944472;p=libfirm

diff --git a/ir/ana/irtypeinfo.c b/ir/ana/irtypeinfo.c
index eba6da013..3ec3895f3 100644
--- a/ir/ana/irtypeinfo.c
+++ b/ir/ana/irtypeinfo.c
@@ -50,7 +50,7 @@ static pmap *type_node_map = NULL;
  *  variable is set by init_irtypeinfo.  The type is freed by
  *  free_irtypeinfo.
  */
-type *initial_type = NULL;
+ir_type *initial_type = NULL;
 
 /* ------------ Initializing this module. ----------------------------- */
 
@@ -60,7 +60,7 @@ type *initial_type = NULL;
  *  in the order of MIN(<calls to set_irn_type>, #irnodes).
  */
 void init_irtypeinfo(void) {
-  int i;
+  int i, n;
 
   if (!initial_type)
     initial_type = new_type_class(new_id_from_str("initial_type"));
@@ -69,26 +69,28 @@ void init_irtypeinfo(void) {
   if (type_node_map) pmap_destroy(type_node_map);
   type_node_map = pmap_create();
 
-  for (i = 0; i < get_irp_n_irgs(); ++i)
+  n = get_irp_n_irgs();
+  for (i = 0; i < n; ++i)
     set_irg_typeinfo_state(get_irp_irg(i), ir_typeinfo_none);
 }
 
 void free_irtypeinfo(void) {
-  int i;
+  int i, n;
 
   if (initial_type) {
     free_type(initial_type);
     initial_type = NULL;
-  } else
-    assert(0 && "call init_type_info before freeing");
+  }
+  //else assert(0 && "call init_type_info before freeing");
 
   if (type_node_map) {
     pmap_destroy(type_node_map);
     type_node_map = NULL;
-  } else
-    assert(0 && "call init_type_info before freeing");
+  }
+  //else assert(0 && "call init_type_info before freeing");
 
-  for (i = 0; i < get_irp_n_irgs(); ++i)
+  n = get_irp_n_irgs();
+  for (i = 0; i < n; ++i)
     set_irg_typeinfo_state(get_irp_irg(i), ir_typeinfo_none);
 }
 
@@ -135,18 +137,20 @@ void set_irp_typeinfo_inconsistent(void) {
  * ir_typeinfo_consistent or ir_typeinfo_inconsistent.  They
  * assume current_ir_graph set properly.
  */
-type *get_irn_typeinfo_type(ir_node *n) {
-  type *res = initial_type;
-  assert(get_irg_typeinfo_state(current_ir_graph) == ir_typeinfo_consistent  ||
-	 get_irg_typeinfo_state(current_ir_graph) == ir_typeinfo_inconsistent  );
+ir_type *get_irn_typeinfo_type(ir_node *n) {
+  ir_type *res = initial_type;
+  pmap_entry *entry;
+  assert(get_irg_typeinfo_state(get_irn_irg(n)) == ir_typeinfo_consistent  ||
+	 get_irg_typeinfo_state(get_irn_irg(n)) == ir_typeinfo_inconsistent  );
 
-  if (pmap_contains(type_node_map, (void *)n))
-    res = (type *) pmap_get(type_node_map, (void *)n);
+  entry = pmap_find(type_node_map, n);
+  if (entry)
+    res = entry->value;
 
   return res;
 }
 
-void set_irn_typeinfo_type(ir_node *n, type *tp) {
+void set_irn_typeinfo_type(ir_node *n, ir_type *tp) {
   assert(get_irg_typeinfo_state(current_ir_graph) == ir_typeinfo_consistent  ||
   	 get_irg_typeinfo_state(current_ir_graph) == ir_typeinfo_inconsistent  );