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
13721372 // For now, we won't try to walk the allocations in the slab, we'll just
13731373 // provide the whole thing as one big chunk.
13741374 size_t HeaderSize =
1375- llvm::alignTo (sizeof (*Slab), llvm::Align (alignof (std:: max_align_t ) ));
1375+ llvm::alignTo (sizeof (*Slab), llvm::Align (MaximumAlignment ));
13761376 AsyncTaskAllocationChunk Chunk;
13771377
13781378 Chunk.Start = SlabPtr + HeaderSize;
Original file line number Diff line number Diff line change 5151
5252#if defined(__GLIBCXX__) && __GLIBCXX__ < 20160726
5353#include < stddef.h>
54- namespace std { using ::max_align_t ; }
5554#endif
5655
5756using namespace swift ;
Original file line number Diff line number Diff line change @@ -274,7 +274,7 @@ _tryCastFromClassToObjCBridgeable(
274274
275275 // The extra byte is for the tag on the T?
276276 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 ];
278278 void *optDestBuffer;
279279 if (destType->getValueWitnesses ()->getStride () <= inlineValueSize) {
280280 // Use the inline buffer.
Original file line number Diff line number Diff line change 1414//
1515// ===----------------------------------------------------------------------===//
1616
17+ #include " swift/ABI/MetadataValues.h"
1718#include " swift/Runtime/Debug.h"
1819#include " llvm/Support/Alignment.h"
1920#include < cstddef>
@@ -67,7 +68,7 @@ class StackAllocator {
6768 bool firstSlabIsPreallocated;
6869
6970 // / The minimal alignment of allocated memory.
70- static constexpr size_t alignment = alignof (std:: max_align_t ) ;
71+ static constexpr size_t alignment = MaximumAlignment ;
7172
7273 // / If set to true, memory allocations are checked for buffer overflows and
7374 // / use-after-free, similar to guard-malloc.
You can’t perform that action at this time.
0 commit comments