commit b19c630befe422dd188382850da63c5463502b22
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Aug 02 18:05:25 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Aug 02 18:05:25 2023 +0000
tree ca23e5a04b4e10f32b624bcf61366c925485a6dc
parent 9ac3bdc11cf5fe5eca9432186919f8bd93a9c242
parent af01fd1afdb9124bfdd4d8b23daa0152dd717956

Snap for 10597283 from af01fd1afdb9124bfdd4d8b23daa0152dd717956 to mainline-permission-release

Change-Id: I8aa7fd6bd3b65ea79626601bcbcf4e8bfa786c00

libunwindstack/Unwinder.cpp

diff --git a/libunwindstack/Unwinder.cpp b/libunwindstack/Unwinder.cpp
index 7304000..115a265 100644
--- a/libunwindstack/Unwinder.cpp
+++ b/libunwindstack/Unwinder.cpp
@@ -389,13 +389,17 @@
     }
   }
 
-  jit_debug_ptr_ = CreateJitDebug(arch_, process_memory_);
-  jit_debug_ = jit_debug_ptr_.get();
-  SetJitDebug(jit_debug_);
+  // jit_debug_ and dex_files_ may have already been set, for example in
+  // AndroidLocalUnwinder::InternalUnwind.
+  if (jit_debug_ == nullptr) {
+    jit_debug_ptr_ = CreateJitDebug(arch_, process_memory_);
+    SetJitDebug(jit_debug_ptr_.get());
+  }
 #if defined(DEXFILE_SUPPORT)
-  dex_files_ptr_ = CreateDexFiles(arch_, process_memory_);
-  dex_files_ = dex_files_ptr_.get();
-  SetDexFiles(dex_files_);
+  if (dex_files_ == nullptr) {
+    dex_files_ptr_ = CreateDexFiles(arch_, process_memory_);
+    SetDexFiles(dex_files_ptr_.get());
+  }
 #endif
 
   return true;