commit 9323e6e44060545d6c4f925139572868f65b7fe3
author David Sehr <sehr@google.com> Tue Sep 13 08:58:35 2016 -0700
committer David Sehr <sehr@google.com> Wed Sep 14 08:01:39 2016 -0700
tree 65f3f380605d75f34d49aec49fca494bec26ef5b
parent 58735fbfbb2da0c0a19b3239da07c2353c40767d

Separate annotations from dexfile reading.

Bug: 22322814
Change-Id: I867d66da407dd80394a10d19903ebbc1ec3986ff
Test: test-art

runtime/debugger.cc

diff --git a/runtime/debugger.cc b/runtime/debugger.cc
index 9f3c2aa..f8a11e5 100644
--- a/runtime/debugger.cc
+++ b/runtime/debugger.cc
@@ -28,6 +28,7 @@
 #include "class_linker.h"
 #include "class_linker-inl.h"
 #include "dex_file-inl.h"
+#include "dex_file_annotations.h"
 #include "dex_instruction.h"
 #include "entrypoints/runtime_asm_entrypoints.h"
 #include "gc/accounting/card_table-inl.h"
@@ -3694,8 +3695,8 @@
           mirror::DexCache* dex_cache = m->GetDeclaringClass()->GetDexCache();
           method = m;
           if (dex_cache != nullptr) {
-            const DexFile& dex_file = *dex_cache->GetDexFile();
-            line_number = dex_file.GetLineNumFromPC(m, GetDexPc());
+            const DexFile* dex_file = dex_cache->GetDexFile();
+            line_number = annotations::GetLineNumFromPC(dex_file, m, GetDexPc());
           }
         }
       }