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 | 988a16af929ece9453622ea256911cdfdf079d47 (patch) | |
| tree | fd490771dd77692a02f8b8d41b1c0bc8630594b1 | |
| parent | f814ad8932ef070ae901677299beecb4410e1b53 (diff) | |
| download | bcm5719-llvm-988a16af929ece9453622ea256911cdfdf079d47.tar.gz bcm5719-llvm-988a16af929ece9453622ea256911cdfdf079d47.zip | |
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
llvm-svn: 336162
| -rw-r--r-- | libcxxabi/src/cxa_demangle.cpp | 3 | ||||
| -rw-r--r-- | llvm/lib/Demangle/ItaniumDemangle.cpp | 3 |
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() { |
