File tree Expand file tree Collapse file tree 4 files changed +4
-4
lines changed Expand file tree Collapse file tree 4 files changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -1372,7 +1372,7 @@ class ReflectionContext
1372
1372
// For now, we won't try to walk the allocations in the slab, we'll just
1373
1373
// provide the whole thing as one big chunk.
1374
1374
size_t HeaderSize =
1375
- llvm::alignTo (sizeof (*Slab), llvm::Align (alignof (std:: max_align_t ) ));
1375
+ llvm::alignTo (sizeof (*Slab), llvm::Align (MaximumAlignment ));
1376
1376
AsyncTaskAllocationChunk Chunk;
1377
1377
1378
1378
Chunk.Start = SlabPtr + HeaderSize;
Original file line number Diff line number Diff line change 51
51
52
52
#if defined(__GLIBCXX__) && __GLIBCXX__ < 20160726
53
53
#include < stddef.h>
54
- namespace std { using ::max_align_t ; }
55
54
#endif
56
55
57
56
using namespace swift ;
Original file line number Diff line number Diff line change @@ -274,7 +274,7 @@ _tryCastFromClassToObjCBridgeable(
274
274
275
275
// The extra byte is for the tag on the T?
276
276
const std::size_t inlineValueSize = 3 * sizeof (void *);
277
- alignas (std:: max_align_t ) char inlineBuffer[inlineValueSize + 1 ];
277
+ alignas (MaximumAlignment ) char inlineBuffer[inlineValueSize + 1 ];
278
278
void *optDestBuffer;
279
279
if (destType->getValueWitnesses ()->getStride () <= inlineValueSize) {
280
280
// Use the inline buffer.
Original file line number Diff line number Diff line change 14
14
//
15
15
// ===----------------------------------------------------------------------===//
16
16
17
+ #include " swift/ABI/MetadataValues.h"
17
18
#include " swift/Runtime/Debug.h"
18
19
#include " llvm/Support/Alignment.h"
19
20
#include < cstddef>
@@ -67,7 +68,7 @@ class StackAllocator {
67
68
bool firstSlabIsPreallocated;
68
69
69
70
// / The minimal alignment of allocated memory.
70
- static constexpr size_t alignment = alignof (std:: max_align_t ) ;
71
+ static constexpr size_t alignment = MaximumAlignment ;
71
72
72
73
// / If set to true, memory allocations are checked for buffer overflows and
73
74
// / use-after-free, similar to guard-malloc.
You can’t perform that action at this time.
0 commit comments