commit 33c1cf94f41ee042709e3c7b83f189970a637da2
author Ben Cheng <bccheng@android.com> Tue Aug 03 12:54:00 2010 -0700
committer Ben Cheng <bccheng@android.com> Tue Aug 03 12:54:00 2010 -0700
tree b2ef868982bf40d1c50b20adb158dbb14661d4f2
parent 7a2697d327936e20ef5484f7819e2e4bf91c891f

Add a missing branch for inlined direct getters.

Change-Id: Ie11925b1856b32aeb6855601195e8a13d23c4e94

vm/compiler/InlineTransformation.c

diff --git a/vm/compiler/InlineTransformation.c b/vm/compiler/InlineTransformation.c
index 6e04cfe..1dfa521 100644
--- a/vm/compiler/InlineTransformation.c
+++ b/vm/compiler/InlineTransformation.c
@@ -194,6 +194,11 @@
         gDvmJit.invokePolySetterInlined++;
 #endif
     } else {
+        /*
+         * The invoke becomes no-op so it needs an explicit branch to jump to
+         * the chaining cell.
+         */
+        invokeBB->needFallThroughBranch = true;
         invokeMIR->OptimizationFlags |= MIR_INLINED;
 #if defined(WITH_JIT_TUNING)
         gDvmJit.invokeMonoSetterInlined++;