[Support] Report OOM from allocate_buffer
#85449
Merged
+7
−4
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@llvm/pr-subscribers-llvm-support Author: Josh Stone (cuviper) ChangesPreviously, it called Ref: #85281 Full diff: https://github.com/llvm/llvm-project/pull/85449.diff 1 Files Affected:
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) {
|
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: llvm#85281
cuviper
force-pushed
the
allocate_buffer-OOM
branch
from
fd9ddc5 to
24f1938
Compare
aeubanks
reviewed
Jan 24, 2025
|
Ok, I'll look into that. |
|
Thanks @nikic! If we're good to go, please do merge it for me, as I don't have write access. |
aeubanks
approved these changes
Jan 27, 2025
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/190/builds/13554 Here is the relevant piece of the build log for the reference |
|
It doesn't make sense to me that this failure would have anything to do with my change. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously, it called
::operator newwhich may throwstd::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 callllvm::report_bad_alloc_errorwhen allocation fails, which will abortwhen LLVM is built without exceptions.
Ref: #85281