Author: rsmith Date: Fri Dec 2 15:43:36 2016 New Revision: 288539 URL: http://llvm.org/viewvc/llvm-project?rev=288539&view=rev Log: Fix up r288457 for compilers that don't support noexcept function types: disable the test entirely for those cases. This is a quick patch, I'll look at a proper feature flag next.
Modified: libcxxabi/trunk/test/catch_function_03.pass.cpp libcxxabi/trunk/test/catch_member_function_pointer_02.pass.cpp Modified: libcxxabi/trunk/test/catch_function_03.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/test/catch_function_03.pass.cpp?rev=288539&r1=288538&r2=288539&view=diff ============================================================================== --- libcxxabi/trunk/test/catch_function_03.pass.cpp (original) +++ libcxxabi/trunk/test/catch_function_03.pass.cpp Fri Dec 2 15:43:36 2016 @@ -13,6 +13,7 @@ #include <cassert> +#ifdef __cpp_noexcept_function_type template<bool Noexcept> void f() noexcept(Noexcept) {} template<bool Noexcept> using FnType = void() noexcept(Noexcept); @@ -57,11 +58,12 @@ 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 } +#else +int main() {} +#endif Modified: libcxxabi/trunk/test/catch_member_function_pointer_02.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/test/catch_member_function_pointer_02.pass.cpp?rev=288539&r1=288538&r2=288539&view=diff ============================================================================== --- libcxxabi/trunk/test/catch_member_function_pointer_02.pass.cpp (original) +++ libcxxabi/trunk/test/catch_member_function_pointer_02.pass.cpp Fri Dec 2 15:43:36 2016 @@ -14,6 +14,7 @@ #include <cassert> +#ifdef __cpp_noexcept_function_type struct X { template<bool Noexcept> void f() noexcept(Noexcept) {} }; @@ -60,11 +61,12 @@ 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 } +#else +int main() {} +#endif _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits