diff options
Diffstat (limited to 'llvm/lib/Support/ErrorHandling.cpp')
| -rw-r--r-- | llvm/lib/Support/ErrorHandling.cpp | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/llvm/lib/Support/ErrorHandling.cpp b/llvm/lib/Support/ErrorHandling.cpp index 27b48670ac0..0f13f7a536f 100644 --- a/llvm/lib/Support/ErrorHandling.cpp +++ b/llvm/lib/Support/ErrorHandling.cpp @@ -186,25 +186,13 @@ static void out_of_memory_new_handler() { llvm::report_bad_alloc_error("Allocation failed"); } -// Installs new handler that causes crash on allocation failure. It does not -// need to be called explicitly, if this file is linked to application, because -// in this case it is called during construction of 'new_handler_installer'. +// Installs new handler that causes crash on allocation failure. It is called by +// InitLLVM. void llvm::install_out_of_memory_new_handler() { - static bool out_of_memory_new_handler_installed = false; - if (!out_of_memory_new_handler_installed) { - std::set_new_handler(out_of_memory_new_handler); - out_of_memory_new_handler_installed = true; - } + std::new_handler old = std::set_new_handler(out_of_memory_new_handler); + (void)old; + assert(old == nullptr && "new-handler already installed"); } - -// Static object that causes installation of 'out_of_memory_new_handler' before -// execution of 'main'. -static class NewHandlerInstaller { -public: - NewHandlerInstaller() { - install_out_of_memory_new_handler(); - } -} new_handler_installer; #endif void llvm::llvm_unreachable_internal(const char *msg, const char *file, |
