X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firgraph.c;h=68cf7830e4f2543e487139be80ddf7b9e8113d69;hb=637542932dc27dcdfc7def09b58d9d5d4c34fb77;hp=e6ff16073746eb491cde4eb0757815b4238f422b;hpb=4684672bcb08245ceef09bcd64d7f388652afb35;p=libfirm

diff --git a/ir/ir/irgraph.c b/ir/ir/irgraph.c
index e6ff16073..68cf7830e 100644
--- a/ir/ir/irgraph.c
+++ b/ir/ir/irgraph.c
@@ -33,6 +33,7 @@
 # include "irouts.h"
 # include "irhooks.h"
 # include "irgwalk.h"
+# include "iredges_t.h"
 
 /**
  * Indicates, whether additional data can be registered to graphs.
@@ -91,13 +92,20 @@ void init_irgraph(void) {
  * allocated (new_r_ir_graph, new_const_code_irg).
  * @return Memory for a new graph.
  */
-static ir_graph *alloc_graph(void)
-{
-	size_t size = sizeof(ir_graph) + additional_graph_data_size;
-	char *ptr = xmalloc(size);
-	memset(ptr, 0, size);
+static ir_graph *alloc_graph(void) {
+  size_t size = sizeof(ir_graph) + additional_graph_data_size;
+  char *ptr = xmalloc(size);
+  memset(ptr, 0, size);
 
-	return (ir_graph *) (ptr + additional_graph_data_size);
+  return (ir_graph *) (ptr + additional_graph_data_size);
+}
+
+/**
+ * Frees an allocated IR graph
+ */
+static void free_graph(ir_graph *irg) {
+  char *ptr = (char *)irg;
+  free(ptr - additional_graph_data_size);
 }
 
 #if USE_EXPLICIT_PHI_IN_STACK
@@ -126,6 +134,8 @@ new_r_ir_graph (entity *ent, int n_loc)
   res = alloc_graph();
   res->kind = k_ir_graph;
 
+  edges_init_graph(res);
+
   /* inform statistics here, as blocks will be already build on this graph */
   hook_new_graph(res, ent);
 
@@ -158,18 +168,23 @@ new_r_ir_graph (entity *ent, int n_loc)
 #endif
   res->kind = k_ir_graph;
   res->obst = xmalloc (sizeof(*res->obst));
-  obstack_init (res->obst);
+  obstack_init(res->obst);
+  res->extbb_obst = NULL;
+
   res->value_table = new_identities (); /* value table for global value
                        numbering for optimizing use in
                        iropt.c */
   res->outs = NULL;
 
-  res->phase_state    = phase_building;
+  res->phase_state      = phase_building;
   res->op_pin_state_pinned = op_pin_state_pinned;
-  res->outs_state     = outs_none;
-  res->dom_state      = dom_none;
-  res->typeinfo_state = irg_typeinfo_none;
-  res->loopinfo_state = loopinfo_none;
+  res->outs_state       = outs_none;
+  res->dom_state        = dom_none;
+  res->typeinfo_state   = ir_typeinfo_none;
+  set_irp_typeinfo_inconsistent();           /* there is a new graph with typeinfo_none. */
+  res->loopinfo_state   = loopinfo_none;
+  res->class_cast_state = ir_class_casts_transitive;
+  res->extblk_state     = ir_extblk_info_none;
 
   /*-- Type information for the procedure of the graph --*/
   res->ent = ent;
@@ -252,8 +267,12 @@ ir_graph *new_const_code_irg(void) {
   res->kind = k_ir_graph;
   res->obst      = xmalloc (sizeof(*res->obst));
   obstack_init (res->obst);
+  res->extbb_obst = NULL;
+
   res->phase_state = phase_building;
   res->op_pin_state_pinned = op_pin_state_pinned;
+  res->extblk_state = ir_extblk_info_none;
+
   res->value_table = new_identities (); /* value table for global value
                        numbering for optimizing use in
                        iropt.c */
@@ -290,6 +309,7 @@ ir_graph *new_const_code_irg(void) {
   set_irn_visited(res->no_mem, -1);
 
   res->phase_state = phase_high;
+
   return res;
 }
 
@@ -304,6 +324,7 @@ void  del_identities (pset *value_table);
    Does not free types, entities or modes that are used only by this
    graph, nor the entity standing for this graph. */
 void free_ir_graph (ir_graph *irg) {
+  assert(is_ir_graph(irg));
 
   hook_free_graph(irg);
   if (irg->outs_state != outs_none) free_outs(irg);
@@ -325,7 +346,7 @@ void free_ir_graph (ir_graph *irg) {
   if (irg->loc_descriptions)
     free(irg->loc_descriptions);
   irg->kind = k_BAD;
-  free(irg);
+  free_graph(irg);
 }
 
 /* access routines for all ir_graph attributes:
@@ -627,18 +648,8 @@ void
 }
 
 void
-set_irg_loopinfo_inconsistent(ir_graph *irg) {
-  if (irg->loopinfo_state == loopinfo_ip_consistent)
-    irg->loopinfo_state = loopinfo_ip_inconsistent;
-
-  else if (irg->loopinfo_state == loopinfo_consistent)
-    irg->loopinfo_state = loopinfo_inconsistent;
-
-  else if (irg->loopinfo_state == loopinfo_cf_ip_consistent)
-    irg->loopinfo_state = loopinfo_cf_ip_inconsistent;
-
-  else if (irg->loopinfo_state == loopinfo_cf_consistent)
-    irg->loopinfo_state = loopinfo_cf_inconsistent;
+(set_irg_loopinfo_inconsistent)(ir_graph *irg) {
+  _set_irg_loopinfo_inconsistent(irg);
 }
 
 void