commit a5a81bfacc70a3e4acac07413cdbfb1afd04a71e
author Eric Fiselier <eric@efcs.ca> Wed Dec 11 20:32:14 2019 -0500
committer Copybara-Service <copybara-worker@google.com> Fri Aug 28 01:03:39 2020 -0700
tree fca1647bafe3785d397bbfb594328a2ed36688d5
parent 9a2ba049809550baea10d2e40529a4b6f45efdfb

[libc++abi] Fix non-constant initialization of default terminate
handlers.

GitOrigin-RevId: a9245e4f86165ac38a297138fff08cd4eb7255a7

src/cxa_default_handlers.cpp

diff --git a/src/cxa_default_handlers.cpp b/src/cxa_default_handlers.cpp
index 573694d..d2f823d 100644
--- a/src/cxa_default_handlers.cpp
+++ b/src/cxa_default_handlers.cpp
@@ -18,6 +18,8 @@
 #include "include/atomic_support.h"
 
 #if !defined(LIBCXXABI_SILENT_TERMINATE)
+
+_LIBCPP_SAFE_STATIC
 static const char* cause = "uncaught";
 
 __attribute__((noreturn))
@@ -82,21 +84,21 @@
     std::terminate();
 }
 
-static std::terminate_handler default_terminate_handler = demangling_terminate_handler;
-static std::terminate_handler default_unexpected_handler = demangling_unexpected_handler;
+static constexpr std::terminate_handler default_terminate_handler = demangling_terminate_handler;
+static constexpr std::terminate_handler default_unexpected_handler = demangling_unexpected_handler;
 #else
-static std::terminate_handler default_terminate_handler = ::abort;
-static std::terminate_handler default_unexpected_handler = std::terminate;
+static constexpr std::terminate_handler default_terminate_handler = ::abort;
+static constexpr std::terminate_handler default_unexpected_handler = std::terminate;
 #endif
 
 //
 // Global variables that hold the pointers to the current handler
 //
 _LIBCXXABI_DATA_VIS
-std::terminate_handler __cxa_terminate_handler = default_terminate_handler;
+_LIBCPP_SAFE_STATIC std::terminate_handler __cxa_terminate_handler = default_terminate_handler;
 
 _LIBCXXABI_DATA_VIS
-std::unexpected_handler __cxa_unexpected_handler = default_unexpected_handler;
+_LIBCPP_SAFE_STATIC std::unexpected_handler __cxa_unexpected_handler = default_unexpected_handler;
 
 namespace std
 {