Fix crash in install_bad_alloc_error_handler #83160
Conversation
… correct variable
|
Thank you for submitting a Pull Request (PR) to the LLVM Project! This PR will be automatically labeled and the relevant teams will be If you wish to, you can add reviewers by using the "Reviewers" section on this page. If this is not working for you, it is probably because you do not have write If you have received no comments on your PR for a week, you can request a review If you have further questions, they may be answered by the LLVM GitHub User Guide. You can also ask questions in a comment on this PR, on the LLVM Discord or on the forums. |
|
@llvm/pr-subscribers-llvm-support Author: Fabian Schiebel (fabianbs96) ChangesFixes #83040 Full diff: https://github.com/llvm/llvm-project/pull/83160.diff 1 Files Affected:
diff --git a/llvm/lib/Support/ErrorHandling.cpp b/llvm/lib/Support/ErrorHandling.cpp
index b8b3b7424ac6b1..d2d3dcc2f478c5 100644
--- a/llvm/lib/Support/ErrorHandling.cpp
+++ b/llvm/lib/Support/ErrorHandling.cpp
@@ -130,7 +130,8 @@ void llvm::install_bad_alloc_error_handler(fatal_error_handler_t handler,
#if LLVM_ENABLE_THREADS == 1
std::lock_guard<std::mutex> Lock(BadAllocErrorHandlerMutex);
#endif
- assert(!ErrorHandler && "Bad alloc error handler already registered!\n");
+ assert(!BadAllocErrorHandler &&
+ "Bad alloc error handler already registered!\n");
BadAllocErrorHandler = handler;
BadAllocErrorHandlerUserData = user_data;
}
|
|
Thanks for the PR! Do you think you can craft a minimal unit test (the one provided in the issue)? You could probably add that to one of the Support unit tests. |
…_alloc error handler registrations
|
Sure! |
There was a problem hiding this comment.
Sure! Do you have any recommendations on how to best "assert" no crash? It seems weird adding unittests without any assertions inside.
If you revert locally your fix in ErrorHandling.cpp a crash should fail the test. That is enough I think to cover the issue (along with an explanation like suggested below).
llvm/unittests/Support/ErrorTest.cpp
Outdated
| TEST(Error, FatalBadAllocErrorHandlersInteraction) { | ||
| auto ErrorHandler = [](void *Data, const char *, bool) {}; | ||
| install_fatal_error_handler(ErrorHandler, nullptr); | ||
| // The following call should not crash |
There was a problem hiding this comment.
I think you should expand just a little more your comment, just to explain we're doing this sequence of calls because of a bug that happened previously inside install_bad_alloc_error_handler.
llvm/unittests/Support/ErrorTest.cpp
Outdated
| // The following call should not crash | ||
| install_bad_alloc_error_handler(ErrorHandler, nullptr); | ||
|
|
||
| // Don't interfere with other tests: |
There was a problem hiding this comment.
Remove : and finish with a full stop (.)
|
@fabianbs96 Congratulations on having your first Pull Request (PR) merged into the LLVM Project! Your changes will be combined with recent changes from other authors, then tested Please check whether problems have been caused by your change specifically, as How to do this, and the rest of the post-merge process, is covered in detail here. If your change does cause a problem, it may be reverted, or you can revert it yourself. If you don't get any reports, no action is required from you. Your changes are working as expected, well done! |
Fixes #83040