summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libcxxabi/src/cxa_demangle.cpp3
-rw-r--r--llvm/lib/Demangle/ItaniumDemangle.cpp3
2 files changed, 2 insertions, 4 deletions
diff --git a/libcxxabi/src/cxa_demangle.cpp b/libcxxabi/src/cxa_demangle.cpp
index 401f3946178..d70ffdf1065 100644
--- a/libcxxabi/src/cxa_demangle.cpp
+++ b/libcxxabi/src/cxa_demangle.cpp
@@ -19,7 +19,6 @@
#include <algorithm>
#include <numeric>
#include <cassert>
-#include <cstddef>
#include <cstdio>
#include <cstdlib>
#include <cstring>
@@ -1891,7 +1890,7 @@ class BumpPointerAllocator {
static constexpr size_t AllocSize = 4096;
static constexpr size_t UsableAllocSize = AllocSize - sizeof(BlockMeta);
- alignas(max_align_t) char InitialBuffer[AllocSize];
+ alignas(16) char InitialBuffer[AllocSize];
BlockMeta* BlockList = nullptr;
void grow() {
diff --git a/llvm/lib/Demangle/ItaniumDemangle.cpp b/llvm/lib/Demangle/ItaniumDemangle.cpp
index b7e2e27ace5..8dd182fad15 100644
--- a/llvm/lib/Demangle/ItaniumDemangle.cpp
+++ b/llvm/lib/Demangle/ItaniumDemangle.cpp
@@ -17,7 +17,6 @@
#include <cassert>
#include <cctype>
#include <cstdio>
-#include <cstddef>
#include <cstdlib>
#include <cstring>
#include <numeric>
@@ -1951,7 +1950,7 @@ class BumpPointerAllocator {
static constexpr size_t AllocSize = 4096;
static constexpr size_t UsableAllocSize = AllocSize - sizeof(BlockMeta);
- alignas(max_align_t) char InitialBuffer[AllocSize];
+ alignas(16) char InitialBuffer[AllocSize];
BlockMeta* BlockList = nullptr;
void grow() {
OpenPOWER on IntegriCloud