Make regex and any assert when they should throw an exception _but_ the user has decreed 'no exceptions'. This matches the behavior of string and vector

llvm-svn: 245239

2 files changed, 6 insertions, 2 deletions

diff --git a/libcxx/include/experimental/any b/libcxx/include/experimental/any
index a38397a99ae..336d6ceebd7 100644
--- a/libcxx/include/experimental/any
+++ b/libcxx/include/experimental/any
@@ -82,6 +82,7 @@ inline namespace fundamentals_v1 {
 #include <typeinfo>
 #include <type_traits>
 #include <cstdlib>
+#include <cassert>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
@@ -106,7 +107,7 @@ inline void __throw_bad_any_cast()
 #ifndef _LIBCPP_NO_EXCEPTIONS
     throw bad_any_cast();
 #else
-    _VSTD::abort();
+    assert(!"bad_any_cast");
 #endif
 }
 
diff --git a/libcxx/include/regex b/libcxx/include/regex
index 6aecd916e98..b355bbb3ac4 100644
--- a/libcxx/include/regex
+++ b/libcxx/include/regex
@@ -762,6 +762,7 @@ typedef regex_token_iterator<wstring::const_iterator> wsregex_token_iterator;
 #include <memory>
 #include <vector>
 #include <deque>
+#include <cassert>
 
 #include <__undef_min_max>
 
@@ -960,7 +961,9 @@ _LIBCPP_ALWAYS_INLINE
 void __throw_regex_error()
 {
 #ifndef _LIBCPP_NO_EXCEPTIONS
-	throw regex_error(_Ev);
+    throw regex_error(_Ev);
+#else
+    assert(!"regex_error");
 #endif
 }