mirror of
https://github.com/abseil/abseil-cpp.git
synced 2026-06-04 12:07:05 +08:00
Export of internal Abseil changes
-- 1801102e11205861bc063e067e9fd4754b625c5a by Derek Mauro <dmauro@google.com>: Internal change PiperOrigin-RevId: 398562681 -- 485008445725d4013f60f4b2876f84b6b47932ec by Jorg Brown <jorg@google.com>: Replace calls to std::isinf with comparison against max(). PiperOrigin-RevId: 398534255 -- 9b99d074d39ad677cf92f99549d22bb73f504f8f by Saleem Abdulrasool <abdulras@google.com>: debugging: add support for non-glibc targets for debugging This relaxes the ELF mem_image handling and subsequently enables the VDSO support for non-glibc targets. The primary need for the restriction was the use of the `__GLIBC_PREREQ` macro. If it is undefined, assume that the glibc pre-requisite is unavailable. This allows building the debugging_internal target on musl targets. PiperOrigin-RevId: 398499050 -- 3cc3630ef2226ae1981a944573f0f9c27a527ebf by Abseil Team <absl-team@google.com>: Replace usages of `auto` with proper typedefs. PiperOrigin-RevId: 398479551 GitOrigin-RevId: 1801102e11205861bc063e067e9fd4754b625c5a Change-Id: Ib13e8612d1b263b9c1ae7f56a9f394b24c3add2e
This commit is contained in:
@@ -98,7 +98,7 @@ template <typename A>
|
||||
void DestroyElements(NoTypeDeduction<A>& allocator, Pointer<A> destroy_first,
|
||||
SizeType<A> destroy_size) {
|
||||
if (destroy_first != nullptr) {
|
||||
for (auto i = destroy_size; i != 0;) {
|
||||
for (SizeType<A> i = destroy_size; i != 0;) {
|
||||
--i;
|
||||
AllocatorTraits<A>::destroy(allocator, destroy_first + i);
|
||||
}
|
||||
@@ -492,7 +492,7 @@ void Storage<T, N, A>::DestroyContents() {
|
||||
|
||||
template <typename T, size_t N, typename A>
|
||||
void Storage<T, N, A>::InitFrom(const Storage& other) {
|
||||
const auto n = other.GetSize();
|
||||
const SizeType<A> n = other.GetSize();
|
||||
assert(n > 0); // Empty sources handled handled in caller.
|
||||
ConstPointer<A> src;
|
||||
Pointer<A> dst;
|
||||
@@ -598,9 +598,9 @@ template <typename ValueAdapter>
|
||||
auto Storage<T, N, A>::Resize(ValueAdapter values, SizeType<A> new_size)
|
||||
-> void {
|
||||
StorageView<A> storage_view = MakeStorageView();
|
||||
auto* const base = storage_view.data;
|
||||
Pointer<A> const base = storage_view.data;
|
||||
const SizeType<A> size = storage_view.size;
|
||||
auto& alloc = GetAllocator();
|
||||
A& alloc = GetAllocator();
|
||||
if (new_size <= size) {
|
||||
// Destroy extra old elements.
|
||||
DestroyElements<A>(alloc, base + new_size, size - new_size);
|
||||
@@ -732,7 +732,7 @@ template <typename T, size_t N, typename A>
|
||||
template <typename... Args>
|
||||
auto Storage<T, N, A>::EmplaceBack(Args&&... args) -> Reference<A> {
|
||||
StorageView<A> storage_view = MakeStorageView();
|
||||
const auto n = storage_view.size;
|
||||
const SizeType<A> n = storage_view.size;
|
||||
if (ABSL_PREDICT_TRUE(n != storage_view.capacity)) {
|
||||
// Fast path; new element fits.
|
||||
Pointer<A> last_ptr = storage_view.data + n;
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
#include <string.h>
|
||||
#include <cassert>
|
||||
#include <cstddef>
|
||||
#include "absl/base/config.h"
|
||||
#include "absl/base/internal/raw_logging.h"
|
||||
|
||||
// From binutils/include/elf/common.h (this doesn't appear to be documented
|
||||
@@ -43,11 +44,11 @@ namespace debugging_internal {
|
||||
|
||||
namespace {
|
||||
|
||||
#if __WORDSIZE == 32
|
||||
#if __SIZEOF_POINTER__ == 4
|
||||
const int kElfClass = ELFCLASS32;
|
||||
int ElfBind(const ElfW(Sym) *symbol) { return ELF32_ST_BIND(symbol->st_info); }
|
||||
int ElfType(const ElfW(Sym) *symbol) { return ELF32_ST_TYPE(symbol->st_info); }
|
||||
#elif __WORDSIZE == 64
|
||||
#elif __SIZEOF_POINTER__ == 8
|
||||
const int kElfClass = ELFCLASS64;
|
||||
int ElfBind(const ElfW(Sym) *symbol) { return ELF64_ST_BIND(symbol->st_info); }
|
||||
int ElfType(const ElfW(Sym) *symbol) { return ELF64_ST_TYPE(symbol->st_info); }
|
||||
@@ -175,17 +176,17 @@ void ElfMemImage::Init(const void *base) {
|
||||
}
|
||||
switch (base_as_char[EI_DATA]) {
|
||||
case ELFDATA2LSB: {
|
||||
if (__LITTLE_ENDIAN != __BYTE_ORDER) {
|
||||
assert(false);
|
||||
return;
|
||||
}
|
||||
#ifndef ABSL_IS_LITTLE_ENDIAN
|
||||
assert(false);
|
||||
return;
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
case ELFDATA2MSB: {
|
||||
if (__BIG_ENDIAN != __BYTE_ORDER) {
|
||||
assert(false);
|
||||
return;
|
||||
}
|
||||
#ifndef ABSL_IS_BIG_ENDIAN
|
||||
assert(false);
|
||||
return;
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
|
||||
@@ -31,8 +31,8 @@
|
||||
#error ABSL_HAVE_ELF_MEM_IMAGE cannot be directly set
|
||||
#endif
|
||||
|
||||
#if defined(__ELF__) && defined(__GLIBC__) && !defined(__native_client__) && \
|
||||
!defined(__asmjs__) && !defined(__wasm__)
|
||||
#if defined(__ELF__) && !defined(__native_client__) && !defined(__asmjs__) && \
|
||||
!defined(__wasm__)
|
||||
#define ABSL_HAVE_ELF_MEM_IMAGE 1
|
||||
#endif
|
||||
|
||||
|
||||
@@ -20,12 +20,25 @@
|
||||
|
||||
#ifdef ABSL_HAVE_VDSO_SUPPORT // defined in vdso_support.h
|
||||
|
||||
#if !defined(__has_include)
|
||||
#define __has_include(header) 0
|
||||
#endif
|
||||
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
#if __has_include(<syscall.h>)
|
||||
#include <syscall.h>
|
||||
#elif __has_include(<sys/syscall.h>)
|
||||
#include <sys/syscall.h>
|
||||
#endif
|
||||
#include <unistd.h>
|
||||
|
||||
#if __GLIBC_PREREQ(2, 16) // GLIBC-2.16 implements getauxval.
|
||||
#if defined(__GLIBC__) && \
|
||||
(__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 16))
|
||||
#define ABSL_HAVE_GETAUXVAL
|
||||
#endif
|
||||
|
||||
#ifdef ABSL_HAVE_GETAUXVAL
|
||||
#include <sys/auxv.h>
|
||||
#endif
|
||||
|
||||
@@ -65,7 +78,7 @@ VDSOSupport::VDSOSupport()
|
||||
// the operation should be idempotent.
|
||||
const void *VDSOSupport::Init() {
|
||||
const auto kInvalidBase = debugging_internal::ElfMemImage::kInvalidBase;
|
||||
#if __GLIBC_PREREQ(2, 16)
|
||||
#ifdef ABSL_HAVE_GETAUXVAL
|
||||
if (vdso_base_.load(std::memory_order_relaxed) == kInvalidBase) {
|
||||
errno = 0;
|
||||
const void *const sysinfo_ehdr =
|
||||
@@ -74,7 +87,7 @@ const void *VDSOSupport::Init() {
|
||||
vdso_base_.store(sysinfo_ehdr, std::memory_order_relaxed);
|
||||
}
|
||||
}
|
||||
#endif // __GLIBC_PREREQ(2, 16)
|
||||
#endif // ABSL_HAVE_GETAUXVAL
|
||||
if (vdso_base_.load(std::memory_order_relaxed) == kInvalidBase) {
|
||||
int fd = open("/proc/self/auxv", O_RDONLY);
|
||||
if (fd == -1) {
|
||||
|
||||
@@ -505,7 +505,7 @@ size_t numbers_internal::SixDigitsToBuffer(double d, char* const buffer) {
|
||||
*out++ = '-';
|
||||
d = -d;
|
||||
}
|
||||
if (std::isinf(d)) {
|
||||
if (d > std::numeric_limits<double>::max()) {
|
||||
strcpy(out, "inf"); // NOLINT(runtime/printf)
|
||||
return out + 3 - buffer;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user