Make JIT inliner work under single-stepping mode.
Bug: 2936661
Change-Id: Id85530db5281e0ea28ffb31e8769f3bfec8be54a
diff --git a/vm/compiler/codegen/arm/CodegenDriver.c b/vm/compiler/codegen/arm/CodegenDriver.c
index 2cfa8fb..86c2e29 100644
--- a/vm/compiler/codegen/arm/CodegenDriver.c
+++ b/vm/compiler/codegen/arm/CodegenDriver.c
@@ -4137,11 +4137,7 @@
* Debugging: screen the opcode first to see if it is in the
* do[-not]-compile list
*/
- bool singleStepMe =
- gDvmJit.includeSelectedOp !=
- ((gDvmJit.opList[dalvikOpCode >> 3] &
- (1 << (dalvikOpCode & 0x7))) !=
- 0);
+ bool singleStepMe = SINGLE_STEP_OP(dalvikOpCode);
#if defined(WITH_SELF_VERIFICATION)
if (singleStepMe == false) {
singleStepMe = selfVerificationPuntOps(mir);