[libcxx] r290652 - Fix debug mode build w/o exceptions

[Eric Fiselier via cfe-commits]

Author: ericwf
Date: Tue Dec 27 23:20:27 2016
New Revision: 290652

URL: http://llvm.org/viewvc/llvm-project?rev=290652&view=rev
Log:
Fix debug mode build w/o exceptions

Modified:
    libcxx/trunk/include/__debug
    libcxx/trunk/lib/abi/CHANGELOG.TXT
    libcxx/trunk/src/debug.cpp

Modified: libcxx/trunk/include/__debug
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/__debug?rev=290652&r1=290651&r2=290652&view=diff
==============================================================================
--- libcxx/trunk/include/__debug (original)
+++ libcxx/trunk/include/__debug Tue Dec 27 23:20:27 2016
@@ -82,6 +82,9 @@ bool __libcpp_set_debug_function(__libcp
 
 // Setup the throwing debug handler during dynamic initialization.
 #if _LIBCPP_DEBUG_LEVEL >= 1 && defined(_LIBCPP_DEBUG_USE_EXCEPTIONS)
+# if defined(_LIBCPP_NO_EXCEPTIONS)
+#   error _LIBCPP_DEBUG_USE_EXCEPTIONS cannot be used when exceptions are disabled.
+# endif
 static bool __init_dummy = __libcpp_set_debug_function(__libcpp_throw_debug_function);
 #endif
 

Modified: libcxx/trunk/lib/abi/CHANGELOG.TXT
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/lib/abi/CHANGELOG.TXT?rev=290652&r1=290651&r2=290652&view=diff
==============================================================================
--- libcxx/trunk/lib/abi/CHANGELOG.TXT (original)
+++ libcxx/trunk/lib/abi/CHANGELOG.TXT Tue Dec 27 23:20:27 2016
@@ -16,7 +16,7 @@ New entries should be added directly bel
 Version 4.0
 -----------
 
-* rTBD - Add _LIBCPP_ASSERT debug handling functions
+* r290651 - Add _LIBCPP_ASSERT debug handling functions
 
   All Platforms
   -------------

Modified: libcxx/trunk/src/debug.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/src/debug.cpp?rev=290652&r1=290651&r2=290652&view=diff
==============================================================================
--- libcxx/trunk/src/debug.cpp (original)
+++ libcxx/trunk/src/debug.cpp Tue Dec 27 23:20:27 2016
@@ -41,7 +41,11 @@ _LIBCPP_NORETURN void __libcpp_abort_deb
 }
 
 _LIBCPP_NORETURN void __libcpp_throw_debug_function(__libcpp_debug_info const& info) {
+#ifndef _LIBCPP_NO_EXCEPTIONS
   throw __libcpp_debug_exception(info);
+#else
+  __libcpp_abort_debug_function(info);
+#endif
 }
 
 struct __libcpp_debug_exception::__libcpp_debug_exception_imp {