From 433b79a9130df5f2375b9d3d7518c1f3fb84a467 Mon Sep 17 00:00:00 2001
From: Nicolas Geoffray <ngeoffray@google.com>
Date: Mon, 30 Jan 2017 20:54:45 +0000
Subject: Revert "Revert "Make --debuggable rely on JIT code.""

Fixed by https://android-review.googlesource.com/#/c/330165/

This reverts commit 81356645157af44152c7b7db383596b5cf3479b5.

Change-Id: Ifb74e1cc90ab6dea621f7f54a00b540d6ccd0cf6
---
 runtime/quick_exception_handler.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'runtime/quick_exception_handler.cc')

diff --git a/runtime/quick_exception_handler.cc b/runtime/quick_exception_handler.cc
index b809c3eb56..110c74b884 100644
--- a/runtime/quick_exception_handler.cc
+++ b/runtime/quick_exception_handler.cc
@@ -347,9 +347,11 @@ class DeoptimizeStackVisitor FINAL : public StackVisitor {
       callee_method_ = method;
       return true;
     } else if (!single_frame_deopt_ &&
-               !Runtime::Current()->IsDeoptimizeable(GetCurrentQuickFramePc())) {
+               !Runtime::Current()->IsAsyncDeoptimizeable(GetCurrentQuickFramePc())) {
       // We hit some code that's not deoptimizeable. However, Single-frame deoptimization triggered
       // from compiled code is always allowed since HDeoptimize always saves the full environment.
+      LOG(WARNING) << "Got request to deoptimize un-deoptimizable method "
+                   << method->PrettyMethod();
       FinishStackWalk();
       return false;  // End stack walk.
     } else {
-- 
cgit v1.2.3-59-g8ed1b