diff options
| author | Erik Pilkington <erik.pilkington@gmail.com> | 2018-07-03 01:30:53 +0000 |
|---|---|---|
| committer | Erik Pilkington <erik.pilkington@gmail.com> | 2018-07-03 01:30:53 +0000 |
| commit | 559b9056600fcfa3f829857ba07bdd2fa32db057 (patch) | |
| tree | e07bcaa04326d8f5363a555c7a0e707d9c581eea /libcxxabi | |
| parent | ffbcb320a60109989264a3f07bbc8388517d960b (diff) | |
Revert r336159, r336157. Some bots failed on qualified std::max_align_t, and other on unqualified max_align_t.
I'll take another stab at this tomorrow. Any ideas for fixing this would be appreciated!
http://lab.llvm.org:8011/builders/lld-x86_64-darwin13/builds/23071/steps/build_Lld/logs/stdio
http://lab.llvm.org:8011/builders/clang-with-thin-lto-ubuntu/builds/11185/steps/build-stage1-compiler/logs/stdio
Diffstat (limited to 'libcxxabi')
| -rw-r--r-- | libcxxabi/src/cxa_demangle.cpp | 3 |
1 files changed, 1 insertions, 2 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() { |