commit 1e0730a34b09bd45075f1c258baffc7a58606307
author Treehugger Robot <treehugger-gerrit@google.com> Mon Oct 09 22:47:36 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 09 22:47:36 2017 +0000
tree a1ca6e13acb5cd152caac65ae8d180f3cc387c0f
parent 85f8c70741eddf3360e9b022bb03e1f9334d7e2a
parent 8f34abacb10936ab1ba87d8d8473c16d6ceddea8

Merge "Move to interpreter if async-exceptions are pending."

runtime/class_linker.cc

diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index 8999e17..0cc2622 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -2866,6 +2866,11 @@
     return true;
   }
 
+  if (Thread::Current()->IsAsyncExceptionPending()) {
+    // Force use of interpreter to handle async-exceptions
+    return true;
+  }
+
   if (runtime->IsJavaDebuggable()) {
     // For simplicity, we ignore precompiled code and go to the interpreter
     // assuming we don't already have jitted code.