Author: zoltan
Date: 2008-02-03 12:33:27 -0500 (Sun, 03 Feb 2008)
New Revision: 94702
Modified:
branches/vargaz/mini-linear-il/mono/mono/mini/ChangeLog
branches/vargaz/mini-linear-il/mono/mono/mini/local-propagation.c
Log:
2008-02-03 Zoltan Varga <[EMAIL PROTECTED]>
* local-propagation.c (mono_branch_to_cmov): Fix some asserts.
Modified: branches/vargaz/mini-linear-il/mono/mono/mini/ChangeLog
===================================================================
--- branches/vargaz/mini-linear-il/mono/mono/mini/ChangeLog 2008-02-03
17:28:51 UTC (rev 94701)
+++ branches/vargaz/mini-linear-il/mono/mono/mini/ChangeLog 2008-02-03
17:33:27 UTC (rev 94702)
@@ -1,5 +1,7 @@
2008-02-03 Zoltan Varga <[EMAIL PROTECTED]>
+ * local-propagation.c (mono_branch_to_cmov): Fix some asserts.
+
* mini.c (mini_method_compile): Disable extended bblocks for now.
(mono_replace_ins): Fix unlinking of bblocks.
Modified: branches/vargaz/mini-linear-il/mono/mono/mini/local-propagation.c
===================================================================
--- branches/vargaz/mini-linear-il/mono/mono/mini/local-propagation.c
2008-02-03 17:28:51 UTC (rev 94701)
+++ branches/vargaz/mini-linear-il/mono/mono/mini/local-propagation.c
2008-02-03 17:33:27 UTC (rev 94702)
@@ -1888,7 +1888,7 @@
if (!(INS_HAS_NO_SIDE_EFFECT (ins1) &&
INS_HAS_NO_SIDE_EFFECT (ins2)))
continue;
- if (bb->last_ins && bb->last_ins->opcode == OP_BR_REG)
+ if (bb->last_ins && (bb->last_ins->opcode == OP_BR_REG
|| bb->last_ins->opcode == OP_BR))
continue;
/* Find the compare instruction */
@@ -2038,6 +2038,9 @@
ins1 = code_bb->code;
+ if (!ins1)
+ continue;
+
/* Check that code_bb is simple */
simple = TRUE;
for (tmp = ins1->next; tmp; tmp = tmp->next)
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
