Fix various bugs found when debugger is attached to the VM.
See b/2161257 for details.
diff --git a/vm/interp/Jit.c b/vm/interp/Jit.c
index 5147e9c..68137a0 100644
--- a/vm/interp/Jit.c
+++ b/vm/interp/Jit.c
@@ -644,7 +644,11 @@
break;
#endif
default:
- dvmAbort();
+ if (!debugOrProfile) {
+ LOGE("Unexpected JIT state: %d", interpState->jitState);
+ dvmAbort();
+ }
+ break;
}
return switchInterp;
}
@@ -908,6 +912,7 @@
#endif
break;
default:
+ LOGE("Unexpected JIT state: %d", interpState->jitState);
dvmAbort();
}
}