[libcxxabi] r295175 - Fix couple of test failures when using the LIBCXXABI_SILENT_TERMINATE mode.

Asiri Rathnayake via cfe-commits cfe-commits at lists.llvm.org
Wed Feb 15 05:43:06 PST 2017


Author: asiri
Date: Wed Feb 15 07:43:05 2017
New Revision: 295175

URL: http://llvm.org/viewvc/llvm-project?rev=295175&view=rev
Log:
Fix couple of test failures when using the LIBCXXABI_SILENT_TERMINATE mode.

When libcxxabi is built in LIBCXXABI_SILENT_TERMINATE mode, libcxx test suite reports
two failures:

  std/depr/exception.unexpected/set.unexpected/get_unexpected.pass.cpp
  std/depr/exception.unexpected/set.unexpected/set_unexpected.pass.cpp

This is because the default unexpected handler is set to std::abort instead of
std::terminate which these tests expect.

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=295175&r1=295174&r2=295175&view=diff
==============================================================================
--- libcxxabi/trunk/src/cxa_default_handlers.cpp (original)
+++ libcxxabi/trunk/src/cxa_default_handlers.cpp Wed Feb 15 07:43:05 2017
@@ -90,7 +90,7 @@ static std::terminate_handler default_te
 static std::terminate_handler default_unexpected_handler = demangling_unexpected_handler;
 #else
 static std::terminate_handler default_terminate_handler = std::abort;
-static std::terminate_handler default_unexpected_handler = std::abort;
+static std::terminate_handler default_unexpected_handler = std::terminate;
 #endif
 
 //




More information about the cfe-commits mailing list