updated

[libfirm] / ir / opt / escape_ana.c

diff --git a/ir/opt/escape_ana.c b/ir/opt/escape_ana.c
index e3974c1..6863eef 100644 (file)
--- a/ir/opt/escape_ana.c
+++ b/ir/opt/escape_ana.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -33,11 +33,12 @@
  *
  * A fast and simple Escape analysis.
  */
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
+#include "iroptimize.h"
+
 #include "irgraph_t.h"
 #include "irnode_t.h"
 #include "type_t.h"
@@ -46,7 +47,6 @@
 #include "analyze_irg_args.h"
 #include "irgmod.h"
 #include "ircons.h"
-#include "escape_ana.h"
 #include "debug.h"
 
 /**
@@ -385,7 +385,7 @@ static void transform_allocs(ir_graph *irg, walk_env_t *env)
 
       if (tv != tarval_bad && tarval_is_long(tv) &&
           get_type_state(atp) == layout_fixed &&
-          get_tarval_long(tv) == get_type_size_bytes(atp)) {
+          (unsigned)get_tarval_long(tv) == get_type_size_bytes(atp)) {
         /* a already lowered type size */
         tp = atp;
       }
@@ -394,6 +394,7 @@ static void transform_allocs(ir_graph *irg, walk_env_t *env)
     if (tp && tp != firm_unknown_type) {
       /* we could determine the type, so we could place it on the frame */
       dbg  = get_irn_dbg_info(alloc);
+      blk  = get_nodes_block(alloc);
 
       DBG((dbgHandle, LEVEL_DEFAULT, "%+F allocation of %+F type %+F placed on frame\n", irg, alloc, tp));
 
@@ -441,8 +442,8 @@ static void transform_allocs(ir_graph *irg, walk_env_t *env)
  */
 static void transform_alloc_calls(ir_graph *irg, walk_env_t *env)
 {
-  ir_node *call, *next, *mem, *size, *blk;
-  ir_type *ftp, *atp, *tp;
+  ir_node *call, *next, *mem, *blk;
+  ir_type *ftp;
 
   /* kill all dead allocs */
   for (call = env->dead_allocs; call; call = next) {
@@ -510,6 +511,7 @@ void escape_analysis(int run_scalar_replace, check_alloc_entity_func callback)
   int i;
   struct obstack obst;
   walk_env_t *env, *elist;
+  (void) run_scalar_replace;
 
   if (get_irp_callee_info_state() != irg_callee_info_consistent) {
     assert(! "need callee info");