commit 17f15ce5a1bae94c2deb7b413054ca6c6bb4122c
author Ben Cheng <bccheng@android.com> Mon Jul 27 16:21:52 2009 -0700
committer Ben Cheng <bccheng@android.com> Mon Jul 27 16:38:51 2009 -0700
tree 89f956af7920e78258057446cc39f2858ef659c6
parent fd8fab767c95fc15687fd80d8d93aa043b5a69f5

Fix a JIT bug where invoke-direct-empty is the last instruction in the trace.

vm/compiler/Frontend.c

diff --git a/vm/compiler/Frontend.c b/vm/compiler/Frontend.c
index c717975..66060a0 100644
--- a/vm/compiler/Frontend.c
+++ b/vm/compiler/Frontend.c
@@ -428,10 +428,14 @@
          * currently only due to trace length constraint. In this case we need
          * to generate an explicit branch at the end of the block to jump to
          * the chaining cell.
+         *
+         * NOTE: INVOKE_DIRECT_EMPTY is actually not an invoke but a nop
          */
         curBB->needFallThroughBranch =
-            (flags & (kInstrCanBranch | kInstrCanSwitch | kInstrCanReturn |
-                      kInstrInvoke)) == 0;
+            ((flags & (kInstrCanBranch | kInstrCanSwitch | kInstrCanReturn |
+                       kInstrInvoke)) == 0) ||
+            (lastInsn->dalvikInsn.opCode == OP_INVOKE_DIRECT_EMPTY);
+
 
         /* Target block not included in the trace */
         if (curBB->taken == NULL &&