[llvm] [Support] Report OOM from `allocate_buffer` (PR #85449)
via llvm-commits
llvm-commits at lists.llvm.org
Fri Mar 15 12:10:07 PDT 2024
llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT-->
@llvm/pr-subscribers-llvm-support
Author: Josh Stone (cuviper)
<details>
<summary>Changes</summary>
Previously, it called `::operator new` which may throw `std::bad_alloc`,
regardless of whether LLVM itself was built with exception handling, and
this can cause safety issues if outside code has destructors that will
call back into LLVM. Now we use `::operator new(..., nothrow)` and call
`llvm::report_bad_alloc_error` when allocation fails, which will abort
when LLVM is built without exceptions.
Ref: https://github.com/llvm/llvm-project/issues/85281
---
Full diff: https://github.com/llvm/llvm-project/pull/85449.diff
1 Files Affected:
- (modified) llvm/lib/Support/MemAlloc.cpp (+7-4)
``````````diff
diff --git a/llvm/lib/Support/MemAlloc.cpp b/llvm/lib/Support/MemAlloc.cpp
index 07a26cf26480b3..6adc9abd75c5b9 100644
--- a/llvm/lib/Support/MemAlloc.cpp
+++ b/llvm/lib/Support/MemAlloc.cpp
@@ -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) {
``````````
</details>
https://github.com/llvm/llvm-project/pull/85449
More information about the llvm-commits
mailing list