maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Allow multiple calls to InitLLVM() (NFC) 

In e99dee82b0, the "out_of_memory_new_handler" was changed to be
explicitly initialized instead of relying on a global static
constructor.
However before this change, install_out_of_memory_new_handler could be
called multiple times while it asserts right now.
We can be more tolerant to calling multiple time InitLLVM without
reintroducing a global constructor for this handler.

Differential Revision: https://reviews.llvm.org/D86330
This commit is contained in:
Mehdi Amini 2020-08-21 04:25:57 +00:00
parent 6ad3de350c
commit 927da43ade
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
llvm/lib/Support/ErrorHandling.cpp
View File

@ -192,7 +192,8 @@ static void out_of_memory_new_handler() {
void llvm::install_out_of_memory_new_handler() { void llvm::install_out_of_memory_new_handler() {
std::new_handler old = std::set_new_handler(out_of_memory_new_handler); std::new_handler old = std::set_new_handler(out_of_memory_new_handler);
(void)old; (void)old;
assert(old == nullptr && "new-handler already installed"); assert((old == nullptr || old == out_of_memory_new_handler) &&
"new-handler already installed");
} }
#endif #endif