[jit] Fix a regression introduced by the addition of an assert in bf467001b10a0e4fe38...
authorZoltan Varga <vargaz@gmail.com>
Sun, 15 Jan 2017 17:54:30 +0000 (12:54 -0500)
committerZoltan Varga <vargaz@gmail.com>
Sun, 15 Jan 2017 17:54:30 +0000 (12:54 -0500)
mono/mini/method-to-ir.c

index 94f28af96851df12d827fe14e038a306ee572652..8c046edac8d3889feea2ece0de6fd32fa69f5bf3 100644 (file)
@@ -6506,7 +6506,8 @@ inline_method (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSignature *fsig,
                 * Get rid of the begin and end bblocks if possible to aid local
                 * optimizations.
                 */
-               mono_merge_basic_blocks (cfg, prev_cbb, sbblock);
+               if (prev_cbb->out_count == 1)
+                       mono_merge_basic_blocks (cfg, prev_cbb, sbblock);
 
                if ((prev_cbb->out_count == 1) && (prev_cbb->out_bb [0]->in_count == 1) && (prev_cbb->out_bb [0] != ebblock))
                        mono_merge_basic_blocks (cfg, prev_cbb, prev_cbb->out_bb [0]);