commit f622d89e27fb0ad0bbf8de2ea1f9cd3ba5f36e24
author David Srbecky <dsrbecky@google.com> Fri Mar 12 08:30:29 2021 +0000
committer David Srbecky <dsrbecky@google.com> Fri Mar 12 16:27:03 2021 +0000
tree 7627180a2bc60194641bc670b2af1143f3ee0872
parent e4d13549b6cb74be757799ce4c37f3f0b893d54a

Adjust to libunwindstack JIT api.

Test: test.py -r -b --host -t 137-cfi
Change-Id: I3518fef55c8fc43720698abd30e70d8f98fe5f21

runtime/backtrace_helper.cc

diff --git a/runtime/backtrace_helper.cc b/runtime/backtrace_helper.cc
index d0f4b34..720bce6 100644
--- a/runtime/backtrace_helper.cc
+++ b/runtime/backtrace_helper.cc
@@ -47,14 +47,15 @@
   static constexpr const char* kTlsKey = "UnwindHelper::kTlsKey";
 
   explicit UnwindHelper(size_t max_depth)
-      : memory_(unwindstack::Memory::CreateProcessMemory(getpid())),
-        jit_(memory_),
-        dex_(memory_),
+      : arch_(unwindstack::Regs::CurrentArch()),
+        memory_(unwindstack::Memory::CreateProcessMemory(getpid())),
+        jit_(unwindstack::CreateJitDebug(arch_, memory_)),
+        dex_(unwindstack::CreateDexFiles(arch_, memory_)),
         unwinder_(max_depth, &maps_, memory_) {
     CHECK(maps_.Parse());
-    unwinder_.SetArch(unwindstack::Regs::CurrentArch());
-    unwinder_.SetJitDebug(&jit_);
-    unwinder_.SetDexFiles(&dex_);
+    unwinder_.SetArch(arch_);
+    unwinder_.SetJitDebug(jit_.get());
+    unwinder_.SetDexFiles(dex_.get());
     unwinder_.SetResolveNames(false);
     unwindstack::Elf::SetCachingEnabled(true);
   }
@@ -75,9 +76,10 @@
 
  private:
   unwindstack::LocalUpdatableMaps maps_;
+  unwindstack::ArchEnum arch_;
   std::shared_ptr<unwindstack::Memory> memory_;
-  unwindstack::JitDebug jit_;
-  unwindstack::DexFiles dex_;
+  std::unique_ptr<unwindstack::JitDebug> jit_;
+  std::unique_ptr<unwindstack::DexFiles> dex_;
   unwindstack::Unwinder unwinder_;
 };