commit 81356645157af44152c7b7db383596b5cf3479b5
author Vladimir Marko <vmarko@google.com> Mon Jan 30 20:18:02 2017 +0000
committer Vladimir Marko <vmarko@google.com> Mon Jan 30 20:19:28 2017 +0000
tree 59aca3792abfa47c7424e4dac13248651e4662b2
parent a0619e25aacf8b8074132f4951f75fdbcfd42925

Revert "Make --debuggable rely on JIT code."

Breaks 137-cfi with ART_TEST_RUN_TEST_DEBUGGABLE=true

This reverts commit a0619e25aacf8b8074132f4951f75fdbcfd42925.

bug: 28769520
Change-Id: Ifd7b8fc7c9b72c0a523fd57c4b1b80edd3547caa

runtime/quick_exception_handler.cc

diff --git a/runtime/quick_exception_handler.cc b/runtime/quick_exception_handler.cc
index 110c74b..b809c3e 100644
--- a/runtime/quick_exception_handler.cc
+++ b/runtime/quick_exception_handler.cc
@@ -347,11 +347,9 @@
       callee_method_ = method;
       return true;
     } else if (!single_frame_deopt_ &&
-               !Runtime::Current()->IsAsyncDeoptimizeable(GetCurrentQuickFramePc())) {
+               !Runtime::Current()->IsDeoptimizeable(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 {