fix the functiondef's .locals...

[xonotic/gmqcc.git] / ir.c

diff --git a/ir.c b/ir.c
index 1f09a9a17d223ca4bee7389e538473c2f6cfa22e..dff566e94a687410840b13d557cc6368f5d54768 100644 (file)
--- a/ir.c
+++ b/ir.c
@@ -1812,6 +1812,7 @@ bool ir_function_calculate_liferanges(ir_function *self)
         {
             if (self->blocks[i]->is_return)
             {
+                self->blocks[i]->living_count = 0;
                 if (!ir_block_life_propagate(self->blocks[i], NULL, &changed))
                     return false;
             }
@@ -2557,7 +2558,6 @@ static bool gen_global_function(ir_builder *ir, ir_value *global)
     }
 
     fun.firstlocal = code_globals_elements;
-    fun.locals     = irfun->allocated_locals + irfun->locals_count;
 
     local_var_end = fun.firstlocal;
     for (i = 0; i < irfun->locals_count; ++i) {
@@ -2582,6 +2582,8 @@ static bool gen_global_function(ir_builder *ir, ir_value *global)
         code_globals_add(0);
     }
 
+    fun.locals = code_globals_elements - fun.firstlocal;
+
     if (irfun->builtin)
         fun.entry = irfun->builtin;
     else {
@@ -2925,7 +2927,7 @@ void ir_function_dump(ir_function *f, char *ind,
     for (i = 0; i < f->locals_count; ++i) {
         size_t l;
         ir_value *v = f->locals[i];
-        oprintf("%s\t%s: ", ind, v->name);
+        oprintf("%s\t%s: unique ", ind, v->name);
         for (l = 0; l < v->life_count; ++l) {
             oprintf("[%i,%i] ", v->life[l].start, v->life[l].end);
         }
@@ -2934,7 +2936,7 @@ void ir_function_dump(ir_function *f, char *ind,
     for (i = 0; i < f->values_count; ++i) {
         size_t l;
         ir_value *v = f->values[i];
-        oprintf("%s\t%s: (%i)", ind, v->name, (int)v->life_count);
+        oprintf("%s\t%s: @%i ", ind, v->name, (int)v->code.local);
         for (l = 0; l < v->life_count; ++l) {
             oprintf("[%i,%i] ", v->life[l].start, v->life[l].end);
         }