commit 23608ab40900463fc5c8461671ba3aa5d0a4260e
author Ben Cheng <bccheng@android.com> Fri Sep 10 17:11:11 2010 -0700
committer Ben Cheng <bccheng@google.com> Fri Sep 10 17:15:37 2010 -0700
tree 71c83ee99afd91cc5c62a847b4fb107b2ef2ca3e
parent 50afc65c674fee10ed9a0380daaee7862cc79d5d

Fix inliner bug for empty callees.

Add an explicit branch to continue from the next instruction.

Bug: 2992514

(cherry-picked from dalvik-dev)

Change-Id: I6e036e330255e7cd9d1504c50c4260910c38dfff

vm/compiler/InlineTransformation.c

diff --git a/vm/compiler/InlineTransformation.c b/vm/compiler/InlineTransformation.c
index 9559f5d..ce45b8b 100644
--- a/vm/compiler/InlineTransformation.c
+++ b/vm/compiler/InlineTransformation.c
@@ -224,6 +224,11 @@
     if (methodStats->attributes & METHOD_IS_EMPTY) {
         /* The original invoke instruction is effectively turned into NOP */
         invokeMIR->OptimizationFlags |= MIR_INLINED;
+        /*
+         * Need to insert an explicit branch to catch the falling knife (into
+         * the PC reconstruction or chaining cell).
+         */
+        invokeBB->needFallThroughBranch = true;
         return;
     }