diff options
| author | 2015-08-26 05:57:33 +0000 | |
|---|---|---|
| committer | 2015-08-26 05:57:33 +0000 | |
| commit | d71c89f46ad60713494d537001d4b370ce355885 (patch) | |
| tree | ae5a3bef3570b4ebe1455f3fd24eeee3fcc53645 /runtime/quick_exception_handler.cc | |
| parent | b5f7abcdef9aec80e67b581a9bcc0de39e98fc85 (diff) | |
| parent | b995c0ab7d6313f32e704e79c1e7dd21f5f160d4 (diff) | |
Merge "Update instrumentation stack after exception event"
Diffstat (limited to 'runtime/quick_exception_handler.cc')
| -rw-r--r-- | runtime/quick_exception_handler.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/runtime/quick_exception_handler.cc b/runtime/quick_exception_handler.cc index d1a4081125..9d5ce9f385 100644 --- a/runtime/quick_exception_handler.cc +++ b/runtime/quick_exception_handler.cc @@ -152,6 +152,9 @@ void QuickExceptionHandler::FindCatch(mirror::Throwable* exception) { if (instrumentation->HasExceptionCaughtListeners() && self_->IsExceptionThrownByCurrentMethod(exception)) { instrumentation->ExceptionCaughtEvent(self_, exception_ref.Get()); + // Instrumentation may have been updated. + method_tracing_active_ = is_deoptimization_ || + Runtime::Current()->GetInstrumentation()->AreExitStubsInstalled(); } } |