Fix exception_test for (USE_LLVM_COMPILER) build.
Finally tdy's patch marks the passing of all gtests on host.
(cherry picked from commit daadfea12645ffafefa1c7debe1178ffc0db1148)
Change-Id: I73ad33cba74d728716cee3656cd76b4be6febe1e
diff --git a/src/thread.cc b/src/thread.cc
index ae460e4..1f1952d 100644
--- a/src/thread.cc
+++ b/src/thread.cc
@@ -1384,7 +1384,7 @@
Frame frame;
frame.SetSP(reinterpret_cast<Method**>(reinterpret_cast<byte*>(cur) +
ShadowFrame::MethodOffset()));
- bool should_continue = visitor->VisitFrame(frame, 0);
+ bool should_continue = visitor->VisitFrame(frame, cur->GetLineNumber());
if (!should_continue) {
return;
}
@@ -1490,7 +1490,11 @@
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();