Skip to content

Commit 988a16a

Browse files
committed
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
1 parent f814ad8 commit 988a16a

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

libcxxabi/src/cxa_demangle.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#include <algorithm>
2020
#include <numeric>
2121
#include <cassert>
22-
#include <cstddef>
2322
#include <cstdio>
2423
#include <cstdlib>
2524
#include <cstring>
@@ -1891,7 +1890,7 @@ class BumpPointerAllocator {
18911890
static constexpr size_t AllocSize = 4096;
18921891
static constexpr size_t UsableAllocSize = AllocSize - sizeof(BlockMeta);
18931892

1894-
alignas(max_align_t) char InitialBuffer[AllocSize];
1893+
alignas(16) char InitialBuffer[AllocSize];
18951894
BlockMeta* BlockList = nullptr;
18961895

18971896
void grow() {

llvm/lib/Demangle/ItaniumDemangle.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#include <cassert>
1818
#include <cctype>
1919
#include <cstdio>
20-
#include <cstddef>
2120
#include <cstdlib>
2221
#include <cstring>
2322
#include <numeric>
@@ -1951,7 +1950,7 @@ class BumpPointerAllocator {
19511950
static constexpr size_t AllocSize = 4096;
19521951
static constexpr size_t UsableAllocSize = AllocSize - sizeof(BlockMeta);
19531952

1954-
alignas(max_align_t) char InitialBuffer[AllocSize];
1953+
alignas(16) char InitialBuffer[AllocSize];
19551954
BlockMeta* BlockList = nullptr;
19561955

19571956
void grow() {

0 commit comments

Comments
 (0)