diff options
Diffstat (limited to 'libcxxabi/test')
| -rw-r--r-- | libcxxabi/test/catch_function_03.pass.cpp | 4 | ||||
| -rw-r--r-- | libcxxabi/test/catch_member_function_pointer_02.pass.cpp | 4 | ||||
| -rw-r--r-- | libcxxabi/test/libcxxabi/test/config.py | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/libcxxabi/test/catch_function_03.pass.cpp b/libcxxabi/test/catch_function_03.pass.cpp index 4118fde1d95..c0b33fd6b4c 100644 --- a/libcxxabi/test/catch_function_03.pass.cpp +++ b/libcxxabi/test/catch_function_03.pass.cpp @@ -9,7 +9,7 @@ // Can a noexcept function pointer be caught by a non-noexcept catch clause? // UNSUPPORTED: c++98, c++03, c++11, c++14 -// UNSUPPORTED: libcxxabi-no-exceptions, libcxxabi-no-qualified-function-types +// UNSUPPORTED: libcxxabi-no-exceptions #include <cassert> @@ -57,9 +57,11 @@ void check_deep() { int main() { +#ifdef __cpp_noexcept_function_type check<false, false>(); check<false, true>(); check<true, false>(); check<true, true>(); check_deep(); +#endif } diff --git a/libcxxabi/test/catch_member_function_pointer_02.pass.cpp b/libcxxabi/test/catch_member_function_pointer_02.pass.cpp index 860d8ed28f8..266337fd945 100644 --- a/libcxxabi/test/catch_member_function_pointer_02.pass.cpp +++ b/libcxxabi/test/catch_member_function_pointer_02.pass.cpp @@ -10,7 +10,7 @@ // Can a noexcept member function pointer be caught by a non-noexcept catch // clause? // UNSUPPORTED: c++98, c++03, c++11, c++14 -// UNSUPPORTED: libcxxabi-no-exceptions, libcxxabi-no-qualified-function-types +// UNSUPPORTED: libcxxabi-no-exceptions #include <cassert> @@ -60,9 +60,11 @@ void check_deep() { int main() { +#ifdef __cpp_noexcept_function_type check<false, false>(); check<false, true>(); check<true, false>(); check<true, true>(); check_deep(); +#endif } diff --git a/libcxxabi/test/libcxxabi/test/config.py b/libcxxabi/test/libcxxabi/test/config.py index 7cb1e9ba6c4..3d5a235df77 100644 --- a/libcxxabi/test/libcxxabi/test/config.py +++ b/libcxxabi/test/libcxxabi/test/config.py @@ -37,8 +37,6 @@ class Configuration(LibcxxConfiguration): super(Configuration, self).configure_features() if not self.get_lit_bool('enable_exceptions', True): self.config.available_features.add('libcxxabi-no-exceptions') - if not self.cxx.addCompileFlagIfSupported(['-Xclang', '-mqualified-function-type-info']): - self.config.available_features.add("libcxxabi-no-qualified-function-types") def configure_compile_flags(self): self.cxx.compile_flags += ['-DLIBCXXABI_NO_TIMER'] |
