Author: zoltan
Date: 2006-06-15 15:22:10 -0400 (Thu, 15 Jun 2006)
New Revision: 61768

Modified:
   branches/vargaz/mini-linear-il/mono/mono/mini/ChangeLog
   branches/vargaz/mini-linear-il/mono/mono/mini/linear-scan.c
   branches/vargaz/mini-linear-il/mono/mono/mini/liveness.c
Log:
2006-06-15  Zoltan Varga  <[EMAIL PROTECTED]>

        * linear-scan.c (compare_by_interval_start_pos_func): Fix sorting of 
variables.

        * liveness.c (mono_analyze_liveness): Fix an assert when COUNT=0 is 
used.


Modified: branches/vargaz/mini-linear-il/mono/mono/mini/ChangeLog
===================================================================
--- branches/vargaz/mini-linear-il/mono/mono/mini/ChangeLog     2006-06-15 
19:20:20 UTC (rev 61767)
+++ branches/vargaz/mini-linear-il/mono/mono/mini/ChangeLog     2006-06-15 
19:22:10 UTC (rev 61768)
@@ -1,3 +1,9 @@
+2006-06-15  Zoltan Varga  <[EMAIL PROTECTED]>
+
+       * linear-scan.c (compare_by_interval_start_pos_func): Fix sorting of 
variables.
+
+       * liveness.c (mono_analyze_liveness): Fix an assert when COUNT=0 is 
used.
+
 2006-05-29  Zoltan Varga  <[EMAIL PROTECTED]>
 
        * mini.c local-propagation.c: Move local cprop/copyprop/deadce to 
local-propagation.c.

Modified: branches/vargaz/mini-linear-il/mono/mono/mini/linear-scan.c
===================================================================
--- branches/vargaz/mini-linear-il/mono/mono/mini/linear-scan.c 2006-06-15 
19:20:20 UTC (rev 61767)
+++ branches/vargaz/mini-linear-il/mono/mono/mini/linear-scan.c 2006-06-15 
19:22:10 UTC (rev 61768)
@@ -251,7 +251,7 @@
        g_list_free (vars);
 }
 
-static gint 
+static gint
 compare_by_interval_start_pos_func (gconstpointer a, gconstpointer b)
 {
        MonoMethodVar *v1 = (MonoMethodVar*)a;
@@ -262,6 +262,8 @@
        else
                if (v1 == v2)
                        return 0;
+               else if (v1->interval->range)
+                       return -1;
                else
                        return 1;
 }

Modified: branches/vargaz/mini-linear-il/mono/mono/mini/liveness.c
===================================================================
--- branches/vargaz/mini-linear-il/mono/mono/mini/liveness.c    2006-06-15 
19:20:20 UTC (rev 61767)
+++ branches/vargaz/mini-linear-il/mono/mono/mini/liveness.c    2006-06-15 
19:22:10 UTC (rev 61768)
@@ -650,9 +650,11 @@
        }
 #endif
 
-       optimize_initlocals (cfg);
+       if (cfg->new_ir) {
+               optimize_initlocals (cfg);
 
-       mono_analyze_liveness2 (cfg);
+               mono_analyze_liveness2 (cfg);
+       }
 }
 
 /**

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to