commit 1acd088ca92b82dee573fbf1b1513a858789ee1a
author Ben Cheng <bccheng@android.com> Fri Sep 10 17:11:11 2010 -0700
committer Ben Cheng <bccheng@android.com> Fri Sep 10 17:11:11 2010 -0700
tree 8657278fad96e005f4d325a44d476bb710c170f9
parent 6b1282f182bbf2fe7bd7714582767403c549e215

Fix inliner bug for empty callees.

Add an explicit branch to continue from the next instruction.

Bug: 2992514
Change-Id: I87f7a2d86e34264688bf283e156816624556b46f

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;
     }