commit fac21782ed87ce800813cfa0f9b4ee4bb4aac462
author Vladimir Marko <vmarko@google.com> Tue Mar 13 17:01:09 2018 +0000
committer Vladimir Marko <vmarko@google.com> Wed Mar 14 11:06:34 2018 +0000
tree f14147d03574751cc2c153cf925354c722111177
parent 68f0680e83179cfe0127fda54a8e02a8552bf619

Fix delivering async exception while in compiled code.

Change artInstrumentationMethodExitFromCode() to check
for async exceptions.

Also fix kDebugExceptionDelivery = true causing stale
ObjPtr<> use.

Test: run-test --jit -runtime-option -Xjitthreshold:0 \
      1934-jvmti-signal-thread
Test: Repeat with kDebugExceptionDelivery = true.
Bug: 74583459
Change-Id: Ia2e777cc3ccef4eba549aa290f8bc12608eafe44

runtime/entrypoints/quick/quick_trampoline_entrypoints.cc

diff --git a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc
index ac67bb3..e9a0808 100644
--- a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc
+++ b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc
@@ -1169,7 +1169,7 @@
   instrumentation::Instrumentation* instrumentation = Runtime::Current()->GetInstrumentation();
   TwoWordReturn return_or_deoptimize_pc = instrumentation->PopInstrumentationStackFrame(
       self, return_pc, gpr_result, fpr_result);
-  if (self->IsExceptionPending()) {
+  if (self->IsExceptionPending() || self->ObserveAsyncException()) {
     return GetTwoWordFailureValue();
   }
   return return_or_deoptimize_pc;