commit c8dc101f8e89feb588de3326bd9be0b84228ca2a
author TDYa127 <tdy@google.com> Thu Apr 19 07:03:33 2012 -0700
committer Shih-wei Liao <sliao@google.com> Sat Apr 21 15:08:42 2012 -0700
tree 22a62a4fa08fcada514f6d6f4497dcef5a2221e5
parent 8cfa88200fcae8dd0a9c4d3cadffc9284985c771

Use dex_pc instead of line_number.

Change-Id: I3759319562428bccabccc66d7afd691682ecca55

src/dex_file.cc

diff --git a/src/dex_file.cc b/src/dex_file.cc
index a054849..85dafee 100644
--- a/src/dex_file.cc
+++ b/src/dex_file.cc
@@ -586,18 +586,12 @@
     return -2;
   }
 
-  return GetLineNumFromPC(method->IsStatic(), method->GetDexMethodIndex(),
-                          GetCodeItem(method->GetCodeItemOffset()), rel_pc);
-}
-
-int32_t DexFile::GetLineNumFromPC(bool is_static, uint32_t method_idx,
-                                  const CodeItem* code_item,
-                                  uint32_t rel_pc) const {
+  const CodeItem* code_item = GetCodeItem(method->GetCodeItemOffset());
   DCHECK(code_item != NULL) << GetLocation();
 
   // A method with no line number info should return -1
   LineNumFromPcContext context(rel_pc, -1);
-  DecodeDebugInfo(code_item, is_static, method_idx, LineNumForPcCb,
+  DecodeDebugInfo(code_item, method->IsStatic(), method->GetDexMethodIndex(), LineNumForPcCb,
                   NULL, &context);
   return context.line_num_;
 }