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

diff --git a/src/thread.cc b/src/thread.cc
index e839d36..d7a9b98 100644
--- a/src/thread.cc
+++ b/src/thread.cc
@@ -574,7 +574,6 @@
     }
     const int kMaxRepetition = 3;
     Method* m = frame.GetMethod();
-#if !defined(ART_USE_LLVM_COMPILER)
     Class* c = m->GetDeclaringClass();
     ClassLinker* class_linker = Runtime::Current()->GetClassLinker();
     const DexCache* dex_cache = c->GetDexCache();
@@ -583,10 +582,6 @@
       const DexFile& dex_file = class_linker->FindDexFile(dex_cache);
       line_number = dex_file.GetLineNumFromPC(m, m->ToDexPC(pc));
     }
-#else
-    // Compiler_LLVM stores line_number in the ShadowFrame, and passes it to visitor.
-    int line_number = static_cast<int>(pc);
-#endif
     if (line_number == last_line_number && last_method == m) {
       repetition_count++;
     } else {
@@ -1321,7 +1316,7 @@
     Frame frame;
     frame.SetSP(reinterpret_cast<Method**>(reinterpret_cast<byte*>(cur) +
                                            ShadowFrame::MethodOffset()));
-    bool should_continue = visitor->VisitFrame(frame, cur->GetLineNumber());
+    bool should_continue = visitor->VisitFrame(frame, cur->GetDexPC());
     if (!should_continue) {
       return;
     }
@@ -1427,11 +1422,7 @@
     Method* method = down_cast<Method*>(method_trace->Get(i));
     mh.ChangeMethod(method);
     uint32_t native_pc = pc_trace->Get(i);
-#if !defined(ART_USE_LLVM_COMPILER)
     int32_t line_number = mh.GetLineNumFromNativePC(native_pc);
-#else
-    int32_t line_number = native_pc; // LLVM stored line_number in the ShadowFrame
-#endif
     // Allocate element, potentially triggering GC
     // TODO: reuse class_name_object via Class::name_?
     const char* descriptor = mh.GetDeclaringClassDescriptor();