commit 7eb3f7aaf43f07caf0de05ba4ae59e8ea6add796
author Ben Cheng <bccheng@android.com> Thu Aug 26 14:56:31 2010 -0700
committer Ben Cheng <bccheng@android.com> Thu Aug 26 23:12:03 2010 -0700
tree d4efed945e6a5b4e453df2547bf334afc31df435
parent fc132a5e75842b516c4021b2bbfa02e134c46040

Make JIT inliner work under single-stepping mode.

Bug: 2936661

(cherry-picked from dalvik-dev)

Change-Id: I35a012bd4dba2a2f9541b96a2e787687bbc7cd19

vm/compiler/InlineTransformation.c

diff --git a/vm/compiler/InlineTransformation.c b/vm/compiler/InlineTransformation.c
index 790cc5d..9559f5d 100644
--- a/vm/compiler/InlineTransformation.c
+++ b/vm/compiler/InlineTransformation.c
@@ -301,6 +301,13 @@
         if (opCode == OP_INVOKE_DIRECT_EMPTY)
             continue;
 
+        /*
+         * If the invoke itself is selected for single stepping, don't bother
+         * to inline it.
+         */
+        if (SINGLE_STEP_OP(opCode))
+            continue;
+
         const Method *calleeMethod;
 
         switch (opCode) {