diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2017-01-30 20:56:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-01-30 20:56:11 +0000 |
| commit | 500d4918e5fb6eafb76b36c4ec736f974835b94c (patch) | |
| tree | 5c6be88b473e60296ae9df22bfc55cfca85a3d28 /runtime/quick_exception_handler.cc | |
| parent | fdd869faca8dff54a456ccb5f1a68ecb44143721 (diff) | |
| parent | 433b79a9130df5f2375b9d3d7518c1f3fb84a467 (diff) | |
Merge "Revert "Revert "Make --debuggable rely on JIT code."""
Diffstat (limited to 'runtime/quick_exception_handler.cc')
| -rw-r--r-- | runtime/quick_exception_handler.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/runtime/quick_exception_handler.cc b/runtime/quick_exception_handler.cc index 8d758a4a4b..4e76951189 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 { |