diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-30 01:22:30 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-30 01:22:30 +0000 |
commit | d0bfb550f782fae5eeca3e28276c24a11a33489f (patch) | |
tree | ca23e5a04b4e10f32b624bcf61366c925485a6dc | |
parent | f5148ad7e332e2b882f019b26c9507d389e797cb (diff) | |
parent | f9eab39c58a59f240fe19c42d82cc56299967175 (diff) | |
download | unwinding-d0bfb550f782fae5eeca3e28276c24a11a33489f.tar.gz |
Snap for 10582058 from f9eab39c58a59f240fe19c42d82cc56299967175 to udc-d2-releaseandroid-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-release
Change-Id: I22e7666c5b43b0b0545f84f5938e79b1828535a7
-rw-r--r-- | libunwindstack/Unwinder.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
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 @@ bool UnwinderFromPid::Init() { } } - 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; |