[PATCH] D64505: [Support] Move the static initializer install_out_memory_new_handler to InitLLVM

Fangrui Song via Phabricator via llvm-commits llvm-commits at lists.llvm.org
Wed Jul 10 09:20:59 PDT 2019


MaskRay updated this revision to Diff 208985.
MaskRay added a comment.

Update comment and delete unnecessary out_of_memory_new_handler_installed

std::set_new_handler just sets a global state. It is very cheap. Not really necessary to guard it with another variable.


Repository:
  rL LLVM

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D64505/new/

https://reviews.llvm.org/D64505

Files:
  lib/Support/ErrorHandling.cpp
  lib/Support/InitLLVM.cpp


Index: lib/Support/InitLLVM.cpp
===================================================================
--- lib/Support/InitLLVM.cpp
+++ lib/Support/InitLLVM.cpp
@@ -23,6 +23,7 @@
 
 InitLLVM::InitLLVM(int &Argc, const char **&Argv) : StackPrinter(Argc, Argv) {
   sys::PrintStackTraceOnErrorSignal(Argv[0]);
+  install_out_of_memory_new_handler();
 
 #ifdef _WIN32
   // We use UTF-8 as the internal character encoding. On Windows,
Index: lib/Support/ErrorHandling.cpp
===================================================================
--- lib/Support/ErrorHandling.cpp
+++ lib/Support/ErrorHandling.cpp
@@ -186,25 +186,11 @@
   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::set_new_handler(out_of_memory_new_handler);
 }
-
-// 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,


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D64505.208985.patch
Type: text/x-patch
Size: 1672 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190710/1cf2d070/attachment.bin>


More information about the llvm-commits mailing list