am 9f54185b: Set "needFallThroughBranch" flag during block split.

* commit '9f54185b4186def90351903bb2e97090e06ab559':
  Set "needFallThroughBranch" flag during block split.

1 files changed, 17 insertions, 1 deletions

diff --git a/vm/compiler/Loop.cpp b/vm/compiler/Loop.cpp
index 89b8e0f14..90c97d767 100644
--- a/vm/compiler/Loop.cpp
+++ b/vm/compiler/Loop.cpp
@@ -552,7 +552,23 @@ bool dvmCompilerFilterLoopBlocks(CompilationUnit *cUnit)
      */
     while (true) {
         /* Loop formed */
-        if (bodyBB->taken == firstBB || bodyBB->fallThrough == firstBB) break;
+        if (bodyBB->taken == firstBB) {
+            /* Check if the fallThrough edge will cause a nested loop */
+            if (bodyBB->fallThrough &&
+                dvmIsBitSet(cUnit->tempBlockV, bodyBB->fallThrough->id)) {
+                return false;
+            }
+            /* Single loop formed */
+            break;
+        } else if (bodyBB->fallThrough == firstBB) {
+            /* Check if the taken edge will cause a nested loop */
+            if (bodyBB->taken &&
+                dvmIsBitSet(cUnit->tempBlockV, bodyBB->taken->id)) {
+                return false;
+            }
+            /* Single loop formed */
+            break;
+        }
 
         /* Inner loops formed first - quit */
         if (bodyBB->fallThrough &&