Fix stacktrace on aarch64 architecture. Fixes #805 (#827)

* Fix stacktrace on aarch64 architecture * Tweak formatting to fit in 80 cols

Fix stacktrace on aarch64 architecture. Fixes #805 (#827)
* Fix stacktrace on aarch64 architecture * Tweak formatting to fit in 80 cols
731852f1 · Roman Gershman · GitHub · 2e5f2bcf · 731852f1
Commit 731852f1 authored Nov 05, 2020 by Roman Gershman Committed by GitHub Nov 05, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

absl/debugging/internal/stacktrace_aarch64-inl.inc
+5 -2

No files found.
--- a/absl/debugging/internal/stacktrace_aarch64-inl.inc
+++ b/absl/debugging/internal/stacktrace_aarch64-inl.inc
@@ -37,8 +37,11 @@ static const unsigned char* GetKernelRtSigreturnAddress() {
  absl::debugging_internal::VDSOSupport vdso;
  if (vdso.IsPresent()) {
    absl::debugging_internal::VDSOSupport::SymbolInfo symbol_info;
-    if (!vdso.LookupSymbol("__kernel_rt_sigreturn", "LINUX_2.6.39", STT_FUNC,
-                           &symbol_info) ||
+    auto lookup = [&](int type) {
+      return vdso.LookupSymbol("__kernel_rt_sigreturn", "LINUX_2.6.39", type,
+                               &symbol_info);
+    };
+    if ((!lookup(STT_FUNC) && !lookup(STT_NOTYPE)) ||
        symbol_info.address == nullptr) {
      // Unexpected: VDSO is present, yet the expected symbol is missing
      // or null.