diff options
| author | David Sehr <sehr@google.com> | 2016-09-13 08:58:35 -0700 |
|---|---|---|
| committer | David Sehr <sehr@google.com> | 2016-09-14 08:01:39 -0700 |
| commit | 9323e6e44060545d6c4f925139572868f65b7fe3 (patch) | |
| tree | 65f3f380605d75f34d49aec49fca494bec26ef5b /runtime/quick_exception_handler.cc | |
| parent | 58735fbfbb2da0c0a19b3239da07c2353c40767d (diff) | |
Separate annotations from dexfile reading.
Bug: 22322814
Change-Id: I867d66da407dd80394a10d19903ebbc1ec3986ff
Test: test-art
Diffstat (limited to 'runtime/quick_exception_handler.cc')
| -rw-r--r-- | runtime/quick_exception_handler.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/quick_exception_handler.cc b/runtime/quick_exception_handler.cc index 55aba2befa..b3f29c28e4 100644 --- a/runtime/quick_exception_handler.cc +++ b/runtime/quick_exception_handler.cc @@ -160,8 +160,8 @@ void QuickExceptionHandler::FindCatch(mirror::Throwable* exception) { LOG(INFO) << "Handler is upcall"; } if (handler_method_ != nullptr) { - const DexFile& dex_file = *handler_method_->GetDeclaringClass()->GetDexCache()->GetDexFile(); - int line_number = dex_file.GetLineNumFromPC(handler_method_, handler_dex_pc_); + const DexFile* dex_file = handler_method_->GetDeclaringClass()->GetDexCache()->GetDexFile(); + int line_number = annotations::GetLineNumFromPC(dex_file, handler_method_, handler_dex_pc_); LOG(INFO) << "Handler: " << PrettyMethod(handler_method_) << " (line: " << line_number << ")"; } } |