commit ea392161b862f2cb93dffa019a32ec7dff47f21f
author Serguei Katkov <serguei.i.katkov@intel.com> Thu Jan 29 17:08:05 2015 +0600
committer Serguei Katkov <serguei.i.katkov@intel.com> Mon Feb 02 21:54:50 2015 +0600
tree ecc685e3337b02aa5f728e581c843e4dfe12efb7
parent 28acb6feb50951645c37c077bd3897ea760ca322

AdvanceMIR does not know how to passthrough the empty block

AdvanceMIR utility function could easily traverse the empty
blocks to find the next bytecode.

Change-Id: I037710b567275799f940b5b9766bcafec570b70e
Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com>

compiler/dex/mir_optimization.cc

diff --git a/compiler/dex/mir_optimization.cc b/compiler/dex/mir_optimization.cc
index 05414b3..8718191 100644
--- a/compiler/dex/mir_optimization.cc
+++ b/compiler/dex/mir_optimization.cc
@@ -116,13 +116,14 @@
   BasicBlock* bb = *p_bb;
   if (mir != NULL) {
     mir = mir->next;
-    if (mir == NULL) {
+    while (mir == NULL) {
       bb = GetBasicBlock(bb->fall_through);
       if ((bb == NULL) || Predecessors(bb) != 1) {
-        mir = NULL;
+        // mir is null and we cannot proceed further.
+        break;
       } else {
-      *p_bb = bb;
-      mir = bb->first_mir_insn;
+        *p_bb = bb;
+        mir = bb->first_mir_insn;
       }
     }
   }