diff options
| author | Abseil Team <absl-team@google.com> | 2018-04-30T18·44-0700 |
|---|---|---|
| committer | vslashg <gfalcon@google.com> | 2018-04-30T19·07-0400 |
| commit | 9613678332c976568272c8f4a78631a29159271d (patch) | |
| tree | 63cd33be6a3d663752065a321319407370ba762c /absl/debugging | |
| parent | 28f5b890702139effabf3576f20e1a4db4a90a80 (diff) | |
- 60c1f40a5e0bc33f93392ff6827528072d749a29 Move ExceptionSafetyTester from the absl:: namespace to t... by Abseil Team <absl-team@google.com>
- abd40a98f8ae746eb151e777ea8a8b5223d68a4b Splits the NoThrow flags into TypeSpec and AllocSpec flag... by Abseil Team <absl-team@google.com> - c16d0b5509b36679b384147b474135e7951afccf Change the abbreviation for the breakdowns of InfinitePas... by Abseil Team <absl-team@google.com> - 8ac104351764f23d666b52dce7536a34c05abf00 Use ABSL_CONST_INIT with std::atomic variables in static ... by Matt Armstrong <marmstrong@google.com> GitOrigin-RevId: 60c1f40a5e0bc33f93392ff6827528072d749a29 Change-Id: I9d45a6ed30ed32ae57e9eff93f4205dbcd71feb2
Diffstat (limited to 'absl/debugging')
| -rw-r--r-- | absl/debugging/internal/stacktrace_aarch64-inl.inc | 3 | ||||
| -rw-r--r-- | absl/debugging/internal/vdso_support.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/absl/debugging/internal/stacktrace_aarch64-inl.inc b/absl/debugging/internal/stacktrace_aarch64-inl.inc index a861c0a18260..7ed6b3eb82dc 100644 --- a/absl/debugging/internal/stacktrace_aarch64-inl.inc +++ b/absl/debugging/internal/stacktrace_aarch64-inl.inc @@ -14,6 +14,7 @@ #include <cstdint> #include <iostream> +#include "absl/base/attributes.h" #include "absl/debugging/internal/address_is_readable.h" #include "absl/debugging/internal/vdso_support.h" // a no-op on non-elf or non-glibc systems #include "absl/debugging/stacktrace.h" @@ -24,7 +25,7 @@ static const uintptr_t kUnknownFrameSize = 0; // Returns the address of the VDSO __kernel_rt_sigreturn function, if present. static const unsigned char* GetKernelRtSigreturnAddress() { constexpr uintptr_t kImpossibleAddress = 1; - static std::atomic<uintptr_t> memoized{kImpossibleAddress}; + ABSL_CONST_INIT static std::atomic<uintptr_t> memoized{kImpossibleAddress}; uintptr_t address = memoized.load(std::memory_order_relaxed); if (address != kImpossibleAddress) { return reinterpret_cast<const unsigned char*>(address); diff --git a/absl/debugging/internal/vdso_support.h b/absl/debugging/internal/vdso_support.h index 870a60a4109c..8002c7405fad 100644 --- a/absl/debugging/internal/vdso_support.h +++ b/absl/debugging/internal/vdso_support.h @@ -41,6 +41,7 @@ #include <atomic> +#include "absl/base/attributes.h" #include "absl/debugging/internal/elf_mem_image.h" #ifdef ABSL_HAVE_ELF_MEM_IMAGE @@ -132,7 +133,7 @@ class VDSOSupport { // This function pointer may point to InitAndGetCPU, // GetCPUViaSyscall, or __vdso_getcpu at different stages of initialization. - static std::atomic<GetCpuFn> getcpu_fn_; + ABSL_CONST_INIT static std::atomic<GetCpuFn> getcpu_fn_; friend int GetCPU(void); // Needs access to getcpu_fn_. |