Avoid Clang error about throwing _LIBCPP_ASSERT in noexcept function.

This fixes a couple of tests which produced a warning that a 'throw'
occurred in a noexcept function (by way of _LIBCPP_ASSERT). It does
so by hiding the 'throw' across an opaque function boundary.

This fix isn't ideal, since we still have _LIBCPP_ASSERT's in functions
marked noexcept -- and this problem should be addressed in the future.
However, throwing _LIBCPP_ASSERT is really only meant to allow testing
of the assertions, and is not yet ready for general use.

llvm-svn: 328265

diff --git a/libcxx/test/libcxx/experimental/filesystem/class.path/path.itr/iterator_db.pass.cpp b/libcxx/test/libcxx/experimental/filesystem/class.path/path.itr/iterator_db.pass.cpp
index aea46f10c9bc98e6e87f3c4923a056836c50e1f6..b8b7124adda416d58bcf73ea35c2884fa233bf6b 100644 (file)
--- a/libcxx/test/libcxx/experimental/filesystem/class.path/path.itr/iterator_db.pass.cpp
+++ b/libcxx/test/libcxx/experimental/filesystem/class.path/path.itr/iterator_db.pass.cpp
@@ -10,13 +10,15 @@
 // UNSUPPORTED: c++98, c++03
 // UNSUPPORTED: libcpp-no-exceptions
 
+// MODULES_DEFINES: _LIBCPP_DEBUG_USE_EXCEPTIONS
+// MODULES_DEFINES: _LIBCPP_DEBUG=0
+
 // <experimental/filesystem>
 
 // class path
 
 #define _LIBCPP_DEBUG 0
-#define _LIBCPP_ASSERT(cond, msg) ((cond) ? ((void)0) : throw 42)
-
+#define _LIBCPP_DEBUG_USE_EXCEPTIONS
 #include <experimental/filesystem>
 #include <iterator>
 #include <type_traits>
@@ -29,17 +31,18 @@ namespace fs = std::experimental::filesystem;
 
 int main() {
   using namespace fs;
+  using ExType = std::__libcpp_debug_exception;
   // Test incrementing/decrementing a singular iterator
   {
     path::iterator singular;
     try {
       ++singular;
       assert(false);
-    } catch (int) {}
+    } catch (ExType const&) {}
     try {
       --singular;
       assert(false);
-    } catch (int) {}
+    } catch (ExType const&) {}
   }
   // Test decrementing the begin iterator
   {
@@ -48,13 +51,13 @@ int main() {
     try {
       --it;
       assert(false);
-    } catch (int) {}
+    } catch (ExType const&) {}
     ++it;
     ++it;
     try {
       ++it;
       assert(false);
-    } catch (int) {}
+    } catch (ExType const&) {}
   }
   // Test incrementing the end iterator
   {
@@ -63,12 +66,12 @@ int main() {
     try {
       ++it;
       assert(false);
-    } catch (int) {}
+    } catch (ExType const&) {}
     --it;
     --it;
     try {
       --it;
       assert(false);
-    } catch (int) {}
+    } catch (ExType const&) {}
   }
 }

diff --git a/libcxx/test/libcxx/thread/futures/futures.promise/set_exception.pass.cpp b/libcxx/test/libcxx/thread/futures/futures.promise/set_exception.pass.cpp
index 9efa597d73e1616595afbf60cb88bc55a6ad505a..abfbb685d91de91b3cddcd7eb383aabb98e27260 100644 (file)
--- a/libcxx/test/libcxx/thread/futures/futures.promise/set_exception.pass.cpp
+++ b/libcxx/test/libcxx/thread/futures/futures.promise/set_exception.pass.cpp
@@ -11,6 +11,9 @@
 // UNSUPPORTED: libcpp-has-no-threads
 // UNSUPPORTED: c++98, c++03
 
+// MODULES_DEFINES: _LIBCPP_DEBUG_USE_EXCEPTIONS
+// MODULES_DEFINES: _LIBCPP_DEBUG=0
+
 // <future>
 
 // class promise<R>
@@ -18,9 +21,8 @@
 // void set_exception(exception_ptr p);
 // Test that a null exception_ptr is diagnosed.
 
-#define _LIBCPP_ASSERT(x, m) ((x) ? ((void)0) : throw 42)
-
 #define _LIBCPP_DEBUG 0
+#define _LIBCPP_DEBUG_USE_EXCEPTIONS
 #include <future>
 #include <exception>
 #include <cstdlib>
@@ -29,14 +31,14 @@
 
 int main()
 {
+    typedef std::__libcpp_debug_exception ExType;
     {
         typedef int T;
         std::promise<T> p;
         try {
             p.set_exception(std::exception_ptr());
             assert(false);
-        } catch (int const& value) {
-            assert(value == 42);
+        } catch (ExType const&) {
         }
     }
     {
@@ -45,8 +47,7 @@ int main()
         try {
             p.set_exception(std::exception_ptr());
             assert(false);
-        } catch (int const& value) {
-            assert(value == 42);
+        } catch (ExType const&) {
         }
     }
 }

diff --git a/libcxx/test/libcxx/thread/futures/futures.promise/set_exception_at_thread_exit.pass.cpp b/libcxx/test/libcxx/thread/futures/futures.promise/set_exception_at_thread_exit.pass.cpp
index dca493382ba238ccd823e1c95af7fdb852f35d53..6736bae97b2b37aa0dd39f8faaf48a740c52e8ff 100644 (file)
--- a/libcxx/test/libcxx/thread/futures/futures.promise/set_exception_at_thread_exit.pass.cpp
+++ b/libcxx/test/libcxx/thread/futures/futures.promise/set_exception_at_thread_exit.pass.cpp
@@ -11,6 +11,9 @@
 // UNSUPPORTED: libcpp-has-no-threads
 // UNSUPPORTED: c++98, c++03
 
+// MODULES_DEFINES: _LIBCPP_DEBUG_USE_EXCEPTIONS
+// MODULES_DEFINES: _LIBCPP_DEBUG=0
+
 // <future>
 
 // class promise<R>
@@ -18,9 +21,8 @@
 // void set_exception_on_thread_exit(exception_ptr p);
 // Test that a null exception_ptr is diagnosed.
 
-#define _LIBCPP_ASSERT(x, m) ((x) ? ((void)0) : throw 42)
-
 #define _LIBCPP_DEBUG 0
+#define _LIBCPP_DEBUG_USE_EXCEPTIONS
 #include <future>
 #include <exception>
 #include <cstdlib>
@@ -29,14 +31,14 @@
 
 int main()
 {
+    typedef std::__libcpp_debug_exception ExType;
     {
         typedef int T;
         std::promise<T> p;
         try {
             p.set_exception_at_thread_exit(std::exception_ptr());
             assert(false);
-        } catch (int const& value) {
-            assert(value == 42);
+        } catch (ExType const& value) {
         }
     }
     {
@@ -45,8 +47,7 @@ int main()
         try {
             p.set_exception_at_thread_exit(std::exception_ptr());
             assert(false);
-        } catch (int const& value) {
-            assert(value == 42);
+        } catch (ExType const& value) {
         }
     }
 }

diff --git a/libcxx/utils/libcxx/test/config.py b/libcxx/utils/libcxx/test/config.py
index 24bbbd52305bd04763bf7f961a3281b582d093f8..2af4a473e6b00b46167a265669d875b4edd754e7 100644 (file)
--- a/libcxx/utils/libcxx/test/config.py
+++ b/libcxx/utils/libcxx/test/config.py
@@ -918,11 +918,6 @@ class Configuration(object):
         self.cxx.addWarningFlagIfSupported('-Wno-user-defined-literals')
         self.cxx.addWarningFlagIfSupported('-Wno-noexcept-type')
         self.cxx.addWarningFlagIfSupported('-Wno-aligned-allocation-unavailable')
-        # FIXME: Remove this work-around. It is a temporary hack to get the
-        # throwing debug tests passing. For example:
-        #  * test/libcxx/experimental/filesystem/class.path/path.itr/iterator_db.pass.cpp
-        #  * test/libcxx/thread/futures/futures.promise/set_exception.pass.cpp
-        self.cxx.addWarningFlagIfSupported("-Wno-exceptions")
         # These warnings should be enabled in order to support the MSVC
         # team using the test suite; They enable the warnings below and
         # expect the test suite to be clean.