[libcxxabi] r323397 - [libc++abi] Fix unused function when building with LIBCXXABI_SILENT_TERMINATE

Peter Collingbourne via cfe-commits cfe-commits at lists.llvm.org
Wed Jan 24 17:38:43 PST 2018


Author: pcc
Date: Wed Jan 24 17:38:43 2018
New Revision: 323397

URL: http://llvm.org/viewvc/llvm-project?rev=323397&view=rev
Log:
[libc++abi] Fix unused function when building with LIBCXXABI_SILENT_TERMINATE

This fixes:
src/cxa_default_handlers.cpp:25:13: error: unused function 'demangling_terminate_handler' [-Werror,-Wunused-function]

Patch by Thomas Anderson!

Differential Revision: https://reviews.llvm.org/D42399

Modified:
    libcxxabi/trunk/src/cxa_default_handlers.cpp

Modified: libcxxabi/trunk/src/cxa_default_handlers.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/src/cxa_default_handlers.cpp?rev=323397&r1=323396&r2=323397&view=diff
==============================================================================
--- libcxxabi/trunk/src/cxa_default_handlers.cpp (original)
+++ libcxxabi/trunk/src/cxa_default_handlers.cpp Wed Jan 24 17:38:43 2018
@@ -19,6 +19,7 @@
 #include "cxa_exception.hpp"
 #include "private_typeinfo.h"
 
+#if !defined(LIBCXXABI_SILENT_TERMINATE)
 static const char* cause = "uncaught";
 
 __attribute__((noreturn))
@@ -84,7 +85,6 @@ static void demangling_unexpected_handle
     std::terminate();
 }
 
-#if !defined(LIBCXXABI_SILENT_TERMINATE)
 static std::terminate_handler default_terminate_handler = demangling_terminate_handler;
 static std::terminate_handler default_unexpected_handler = demangling_unexpected_handler;
 #else




More information about the cfe-commits mailing list