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/object.cc

diff --git a/src/object.cc b/src/object.cc
index 8c101ba..5413194 100644
--- a/src/object.cc
+++ b/src/object.cc
@@ -468,6 +468,7 @@
 }
 
 uint32_t Method::ToDexPC(const uintptr_t pc) const {
+#if !defined(ART_USE_LLVM_COMPILER)
   const uint32_t* mapping_table = GetMappingTable();
   if (mapping_table == NULL) {
     DCHECK(IsNative() || IsCalleeSaveMethod() || IsProxyMethod()) << PrettyMethod(this);
@@ -491,6 +492,10 @@
     }
   }
   return best_dex_offset;
+#else
+  // Compiler LLVM doesn't use the machine pc, we just use dex pc instead.
+  return static_cast<uint32_t>(pc);
+#endif
 }
 
 uintptr_t Method::ToNativePC(const uint32_t dex_pc) const {