2009-01-05 Zoltan Varga <vargaz@gmail.com>

	* branch-opts.c (mono_if_conversion): Fix another assert introduced by
	the last change.

svn path=/branches/mono-2-2/mono/; revision=122472

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index 742d7dbe59bf4fd97d3e1e6f88d33efa0c9347e7..9e7d697ac5588a701088ed247b7f0acfa347866b 100644 (file)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,5 +1,8 @@
 2009-01-05  Zoltan Varga  <vargaz@gmail.com>
 
+       * branch-opts.c (mono_if_conversion): Fix another assert introduced by
+       the last change.
+
        Backport of r122452.
        
        * mini.c (mono_allocate_stack_slots_full2): Use mono_class_from_mono_type

diff --git a/mono/mini/branch-opts.c b/mono/mini/branch-opts.c
index 08904ffe14a16514511140326582552abaf32a30..8f0c053b141a9df676cb95901b0f5b0de9d0d47a 100644 (file)
--- a/mono/mini/branch-opts.c
+++ b/mono/mini/branch-opts.c
@@ -309,7 +309,8 @@ mono_if_conversion (MonoCompile *cfg)
                        /* FIXME: Optimize this using prev */
                        prev = NULL;
                        compare = bb->code;
-                       g_assert (compare);
+                       if (!compare)
+                               continue;
                        while (compare->next && !MONO_IS_COND_BRANCH_OP (compare->next)) {
                                prev = compare;
                                compare = compare->next;