Merge pull request #832 from xplicit/webperf1

[mono.git] / mono / mini / liveness.c

diff --git a/mono/mini/liveness.c b/mono/mini/liveness.c
index a1c0cbd4468ea41f67b0a8fc6bc81637937c4ffa..a5cbabb53a53333dd2ecf2a2cfd1012bb780d507 100644 (file)
--- a/mono/mini/liveness.c
+++ b/mono/mini/liveness.c
@@ -219,7 +219,8 @@ analyze_liveness_bb (MonoCompile *cfg, MonoBasicBlock *bb)
        MonoMethodVar *vars = cfg->vars;
        guint32 abs_pos = (bb->dfn << 16);
        
-       for (inst_num = 0, ins = bb->code; ins; ins = ins->next, inst_num += 2) {
+       /* Start inst_num from > 0, so last_use.abs_pos is only 0 for dead variables */
+       for (inst_num = 2, ins = bb->code; ins; ins = ins->next, inst_num += 2) {
                const char *spec = INS_INFO (ins->opcode);
                int num_sregs, i;
                int sregs [MONO_MAX_SRC_REGS];
@@ -848,7 +849,7 @@ mono_analyze_liveness2 (MonoCompile *cfg)
        MonoInst **reverse;
 
        if (disabled == -1)
-               disabled = getenv ("DISABLED") != NULL;
+               disabled = g_getenv ("DISABLED") != NULL;
 
        if (disabled)
                return;