commit 95cd9ac6c308008b6bd48e6e516c118fce0e6a1f
author Ben Cheng <bccheng@android.com> Fri Mar 12 16:58:24 2010 -0800
committer Ben Cheng <bccheng@android.com> Fri Mar 12 16:58:24 2010 -0800
tree a63f33ddfba0c9d3d8660918d0f31d53c2405b9c
parent 3ed90a94fa2eea45a423471405df5df62b187b83

Stay in the dbg interpreter if the entry reason is to deal with exceptions.

Bug: 2487514
Change-Id: Id1eb91f347ff772714d9560370b9994f46d3c5cb

vm/mterp/out/InterpC-portdbg.c

diff --git a/vm/mterp/out/InterpC-portdbg.c b/vm/mterp/out/InterpC-portdbg.c
index de2c006..fbb06bf 100644
--- a/vm/mterp/out/InterpC-portdbg.c
+++ b/vm/mterp/out/InterpC-portdbg.c
@@ -1484,6 +1484,11 @@
 #if defined(WITH_SELF_VERIFICATION)
          (interpState->jitState != kJitSelfVerification) &&
 #endif
+         /*
+          * Don't bail out of the dbg interpreter if the entry reason is to
+          * deal with a thrown exception.
+          */
+         (interpState->entryPoint != kInterpEntryThrow) &&
          !gDvm.debuggerActive &&
 #if defined(WITH_PROFILER)
          (gDvm.activeProfilers == 0) &&

vm/mterp/out/InterpC-portstd.c

diff --git a/vm/mterp/out/InterpC-portstd.c b/vm/mterp/out/InterpC-portstd.c
index 2d1ba8c..a0bc17e 100644
--- a/vm/mterp/out/InterpC-portstd.c
+++ b/vm/mterp/out/InterpC-portstd.c
@@ -1223,6 +1223,11 @@
 #if defined(WITH_SELF_VERIFICATION)
          (interpState->jitState != kJitSelfVerification) &&
 #endif
+         /*
+          * Don't bail out of the dbg interpreter if the entry reason is to
+          * deal with a thrown exception.
+          */
+         (interpState->entryPoint != kInterpEntryThrow) &&
          !gDvm.debuggerActive &&
 #if defined(WITH_PROFILER)
          (gDvm.activeProfilers == 0) &&

vm/mterp/portable/entry.c

diff --git a/vm/mterp/portable/entry.c b/vm/mterp/portable/entry.c
index 8ea4bdc..6789450 100644
--- a/vm/mterp/portable/entry.c
+++ b/vm/mterp/portable/entry.c
@@ -48,6 +48,11 @@
 #if defined(WITH_SELF_VERIFICATION)
          (interpState->jitState != kJitSelfVerification) &&
 #endif
+         /*
+          * Don't bail out of the dbg interpreter if the entry reason is to
+          * deal with a thrown exception.
+          */
+         (interpState->entryPoint != kInterpEntryThrow) &&
          !gDvm.debuggerActive &&
 #if defined(WITH_PROFILER)
          (gDvm.activeProfilers == 0) &&