From 3917120a4c6ba8c401714c1655b4a6d7ace3d049 Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Tue, 6 Feb 2018 06:42:19 -0800 Subject: Changes imported from Abseil "staging" branch: - b7ac57541b07fadc3ed054cc3d62bc192a2098a7 Redefine arithmetic assign operators in terms of the bina... by Alex Strelnikov - bb2bf3fd86eb9f24420376aad1b9fe84068ad7e4 Cmake CI for Ubuntu by Jon Cohen - 3ff3e6d6b4d99627f0785cad5b562362bdf1ae37 Fix internal namespace (debug_internal -> debugging_inter... by Derek Mauro - b50753d757c95a3430cc2d6cfc0272af1e5c219c Internal change. by Alex Strelnikov GitOrigin-RevId: b7ac57541b07fadc3ed054cc3d62bc192a2098a7 Change-Id: I7561639e296d1cc5dc7ee75e6645e8dae3f1bf97 --- absl/debugging/internal/stacktrace_x86-inl.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'absl/debugging/internal/stacktrace_x86-inl.inc') diff --git a/absl/debugging/internal/stacktrace_x86-inl.inc b/absl/debugging/internal/stacktrace_x86-inl.inc index 7c146ad3221f..ac85b9203324 100644 --- a/absl/debugging/internal/stacktrace_x86-inl.inc +++ b/absl/debugging/internal/stacktrace_x86-inl.inc @@ -170,11 +170,11 @@ static void **NextStackFrame(void **old_fp, const void *uc) { static const unsigned char *kernel_rt_sigreturn_address = nullptr; static const unsigned char *kernel_vsyscall_address = nullptr; if (num_push_instructions == -1) { - absl::debug_internal::VDSOSupport vdso; + absl::debugging_internal::VDSOSupport vdso; if (vdso.IsPresent()) { - absl::debug_internal::VDSOSupport::SymbolInfo + absl::debugging_internal::VDSOSupport::SymbolInfo rt_sigreturn_symbol_info; - absl::debug_internal::VDSOSupport::SymbolInfo vsyscall_symbol_info; + absl::debugging_internal::VDSOSupport::SymbolInfo vsyscall_symbol_info; if (!vdso.LookupSymbol("__kernel_rt_sigreturn", "LINUX_2.5", STT_FUNC, &rt_sigreturn_symbol_info) || !vdso.LookupSymbol("__kernel_vsyscall", "LINUX_2.5", STT_FUNC, @@ -221,7 +221,7 @@ static void **NextStackFrame(void **old_fp, const void *uc) { // "double fault" in case we hit the first fault due to e.g. stack // corruption. void *const reg_esp2 = reg_esp[num_push_instructions - 1]; - if (absl::debug_internal::AddressIsReadable(reg_esp2)) { + if (absl::debugging_internal::AddressIsReadable(reg_esp2)) { // Alleged %esp is readable, use it for further unwinding. new_fp = reinterpret_cast(reg_esp2); } @@ -273,7 +273,7 @@ static void **NextStackFrame(void **old_fp, const void *uc) { // Note: NextStackFrame() is only called while the program // is already on its last leg, so it's ok to be slow here. - if (!absl::debug_internal::AddressIsReadable(new_fp)) { + if (!absl::debugging_internal::AddressIsReadable(new_fp)) { return nullptr; } } -- cgit 1.4.1