Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions llvm/lib/Support/MemAlloc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,15 @@

LLVM_ATTRIBUTE_RETURNS_NONNULL LLVM_ATTRIBUTE_RETURNS_NOALIAS void *
llvm::allocate_buffer(size_t Size, size_t Alignment) {
return ::operator new(Size
void *Result = ::operator new(Size,
#ifdef __cpp_aligned_new
,
std::align_val_t(Alignment)
std::align_val_t(Alignment),
#endif
);
std::nothrow);
if (Result == nullptr) {
report_bad_alloc_error("Buffer allocation failed");
}
return Result;
}

void llvm::deallocate_buffer(void *Ptr, size_t Size, size_t Alignment) {
Expand Down
Loading