summaryrefslogtreecommitdiff
path: root/absl
diff options
context:
space:
mode:
authorGravatar Abseil Team <absl-team@google.com>2022-03-17 09:43:32 -0700
committerGravatar Andy Getz <durandal@google.com>2022-03-17 15:07:13 -0400
commit9f5b2c782ad50df4692bc66f1687e1f4d43c7308 (patch)
treefe6cfb343ba3120565d58de71586a1c1bc214313 /absl
parente6ae2641f6261c67adb5766ccbcf953e2bb0a8fd (diff)
Export of internal Abseil changes
-- 399d051d30f7a78c367bb1dc08829ffacbb619a6 by Abseil Team <absl-team@google.com>: Fix a glitch in symbolization which could result in the same address being correctly symbolized and "(unknown)" in the same crash report. PiperOrigin-RevId: 435371003 Change-Id: I9f6a5684144be6d3d366584601d79fda9eefdce6 -- 5dad813de52773e0bb09c6b2351e1bbadb53deac by Abseil Team <absl-team@google.com>: Fix ABSL_HAVE_MMAP check in direct_mmap.h This change makes the check for ABSL_HAVE_MMAP match the other checks in absl. This fixes builds where ABSL_HAVE_MMAP is not defined. PiperOrigin-RevId: 435190242 Change-Id: I11638ef315849cafcf4ea1611eee1a98c80e7dcb GitOrigin-RevId: 399d051d30f7a78c367bb1dc08829ffacbb619a6
Diffstat (limited to 'absl')
-rw-r--r--absl/base/internal/direct_mmap.h2
-rw-r--r--absl/debugging/internal/examine_stack.cc3
2 files changed, 3 insertions, 2 deletions
diff --git a/absl/base/internal/direct_mmap.h b/absl/base/internal/direct_mmap.h
index 274054cd..a01d6122 100644
--- a/absl/base/internal/direct_mmap.h
+++ b/absl/base/internal/direct_mmap.h
@@ -20,7 +20,7 @@
#include "absl/base/config.h"
-#if ABSL_HAVE_MMAP
+#ifdef ABSL_HAVE_MMAP
#include <sys/mman.h>
diff --git a/absl/debugging/internal/examine_stack.cc b/absl/debugging/internal/examine_stack.cc
index 81d216f9..e0950b72 100644
--- a/absl/debugging/internal/examine_stack.cc
+++ b/absl/debugging/internal/examine_stack.cc
@@ -146,7 +146,8 @@ static void DumpPCAndFrameSizeAndSymbol(void (*writerfn)(const char*, void*),
const char* const prefix) {
char tmp[1024];
const char* symbol = "(unknown)";
- if (absl::Symbolize(symbolize_pc, tmp, sizeof(tmp))) {
+ if (absl::Symbolize(symbolize_pc, tmp, sizeof(tmp)) ||
+ (pc != symbolize_pc && absl::Symbolize(pc, tmp, sizeof(tmp)))) {
symbol = tmp;
}
char buf[1024];