Disable JIT single-stepping resume mode.

BUG: 5551114
Change-Id: Id8ee75be5e71ee258994235952871ad181024e56

diff --git a/vm/interp/Interp.cpp b/vm/interp/Interp.cpp
index f78b7a4..de85fa1 100644 (file)
--- a/vm/interp/Interp.cpp
+++ b/vm/interp/Interp.cpp
@@ -1829,6 +1829,10 @@ void dvmCheckBefore(const u2 *pc, u4 *fp, Thread* self)
                 }
             }
 #endif
+#if 0
+            // TODO - fix JIT single-stepping resume mode (b/5551114)
+            // self->jitResumeNPC needs to be cleared in callPrep
+
             // If we've got a native return and no other reasons to
             // remain in singlestep/break mode, do a long jump
             if (self->jitResumeNPC != NULL &&
@@ -1845,6 +1849,7 @@ void dvmCheckBefore(const u2 *pc, u4 *fp, Thread* self)
             self->jitResumeDPC = NULL;
             self->inJitCodeCache = NULL;
 #endif
+#endif
         } else {
             self->singleStepCount--;
 #if defined(WITH_JIT)