diff options
| author | David Brazdil <dbrazdil@google.com> | 2015-09-15 16:52:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-09-15 16:52:02 +0000 |
| commit | 5559f9decadf23e887030fa35ad9d0fcc922046b (patch) | |
| tree | 1f697d6afc0da2a9ef77ce296b96b33b54af1e2a /runtime/quick_exception_handler.cc | |
| parent | 0c1b297d586b71970da17c77774c27a6603118f6 (diff) | |
| parent | 72f7b880d5d0057b9fac3a51ef3a0f22909bc633 (diff) | |
Merge "ART: Fix 004-ReferenceMap run test"
Diffstat (limited to 'runtime/quick_exception_handler.cc')
| -rw-r--r-- | runtime/quick_exception_handler.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/runtime/quick_exception_handler.cc b/runtime/quick_exception_handler.cc index b9d76b491c..c905b63c6c 100644 --- a/runtime/quick_exception_handler.cc +++ b/runtime/quick_exception_handler.cc @@ -97,7 +97,8 @@ class CatchBlockStackVisitor FINAL : public StackVisitor { if (found_dex_pc != DexFile::kDexNoIndex) { exception_handler_->SetHandlerMethod(method); exception_handler_->SetHandlerDexPc(found_dex_pc); - exception_handler_->SetHandlerQuickFramePc(method->ToNativeQuickPc(found_dex_pc)); + exception_handler_->SetHandlerQuickFramePc( + method->ToNativeQuickPc(found_dex_pc, /* is_catch_handler */ true)); exception_handler_->SetHandlerQuickFrame(GetCurrentQuickFrame()); return false; // End stack walk. } |