commit 249d6896be0c5179c6d6b4fd1e3d8f092a01582d
author Ryan Prichard <rprichard@google.com> Fri Oct 18 15:48:18 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Oct 18 15:48:18 2019 -0700
tree de1d15ccb3346ef23ab1df635743a5a14a75ab44
parent 0eb92a2ce73ef1f07320695e6782399237393dab
parent 2d1e9b81f0259d1ab404d13dd4c60d8e576f348b

[UPSTREAM][libunwind][Android] Fix findUnwindSections for ARM EHABI Bionic
am: 2d1e9b81f0

Change-Id: I0d1aed73740848dffb2f37e54f7930b27b8cd3b5

src/AddressSpace.hpp

diff --git a/src/AddressSpace.hpp b/src/AddressSpace.hpp
index fb370ad..18e7228 100644
--- a/src/AddressSpace.hpp
+++ b/src/AddressSpace.hpp
@@ -29,6 +29,13 @@
 #include <dlfcn.h>
 #endif
 
+#if defined(_LIBUNWIND_ARM_EHABI)
+struct EHABIIndexEntry {
+  uint32_t functionOffset;
+  uint32_t data;
+};
+#endif
+
 #ifdef __APPLE__
 #include <mach-o/getsect.h>
 namespace libunwind {
@@ -459,12 +466,13 @@
   (void)targetAddr;
   (void)info;
   return true;
-#elif defined(_LIBUNWIND_ARM_EHABI) && defined(__BIONIC__) &&                  \
-    (__ANDROID_API__ < 21)
+#elif defined(_LIBUNWIND_ARM_EHABI) && defined(__BIONIC__)
+  // For ARM EHABI, Bionic didn't implement dl_iterate_phdr until API 21. After
+  // API 21, dl_iterate_phdr exists, but dl_unwind_find_exidx is much faster.
   int length = 0;
   info.arm_section =
       (uintptr_t)dl_unwind_find_exidx((_Unwind_Ptr)targetAddr, &length);
-  info.arm_section_length = (uintptr_t)length;
+  info.arm_section_length = (uintptr_t)length * sizeof(EHABIIndexEntry);
   if (info.arm_section && info.arm_section_length)
     return true;
 #elif defined(_LIBUNWIND_ARM_EHABI) || defined(_LIBUNWIND_SUPPORT_DWARF_UNWIND)

src/UnwindCursor.hpp

diff --git a/src/UnwindCursor.hpp b/src/UnwindCursor.hpp
index 836de38..e2de6d5 100644
--- a/src/UnwindCursor.hpp
+++ b/src/UnwindCursor.hpp
@@ -1222,11 +1222,6 @@
 #endif // defined(_LIBUNWIND_SUPPORT_SEH_UNWIND)
 
 #if defined(_LIBUNWIND_ARM_EHABI)
-struct EHABIIndexEntry {
-  uint32_t functionOffset;
-  uint32_t data;
-};
-
 template<typename A>
 struct EHABISectionIterator {
   typedef EHABISectionIterator _Self;