diff --git a/libcxx/test/libcxx/debug/containers/db_associative_container_tests.pass.cpp b/libcxx/test/libcxx/debug/containers/db_associative_container_tests.pass.cpp --- a/libcxx/test/libcxx/debug/containers/db_associative_container_tests.pass.cpp +++ b/libcxx/test/libcxx/debug/containers/db_associative_container_tests.pass.cpp @@ -8,7 +8,6 @@ // UNSUPPORTED: c++03, c++11, c++14 // UNSUPPORTED: windows -// UNSUPPORTED: libcpp-no-if-constexpr // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DEBUG=1 // UNSUPPORTED: libcxx-no-debug-mode diff --git a/libcxx/test/libcxx/debug/containers/db_sequence_container_iterators.multithread.pass.cpp b/libcxx/test/libcxx/debug/containers/db_sequence_container_iterators.multithread.pass.cpp --- a/libcxx/test/libcxx/debug/containers/db_sequence_container_iterators.multithread.pass.cpp +++ b/libcxx/test/libcxx/debug/containers/db_sequence_container_iterators.multithread.pass.cpp @@ -9,7 +9,6 @@ // UNSUPPORTED: c++03, c++11, c++14 // UNSUPPORTED: windows // UNSUPPORTED: libcpp-has-no-threads -// UNSUPPORTED: libcpp-no-if-constexpr // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DEBUG=1 // UNSUPPORTED: libcxx-no-debug-mode diff --git a/libcxx/test/libcxx/debug/containers/db_sequence_container_iterators.pass.cpp b/libcxx/test/libcxx/debug/containers/db_sequence_container_iterators.pass.cpp --- a/libcxx/test/libcxx/debug/containers/db_sequence_container_iterators.pass.cpp +++ b/libcxx/test/libcxx/debug/containers/db_sequence_container_iterators.pass.cpp @@ -8,7 +8,6 @@ // UNSUPPORTED: c++03, c++11, c++14 // UNSUPPORTED: windows -// UNSUPPORTED: libcpp-no-if-constexpr // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DEBUG=1 // UNSUPPORTED: libcxx-no-debug-mode diff --git a/libcxx/test/libcxx/debug/containers/db_string.pass.cpp b/libcxx/test/libcxx/debug/containers/db_string.pass.cpp --- a/libcxx/test/libcxx/debug/containers/db_string.pass.cpp +++ b/libcxx/test/libcxx/debug/containers/db_string.pass.cpp @@ -8,7 +8,6 @@ // UNSUPPORTED: c++03, c++11, c++14 // UNSUPPORTED: windows -// UNSUPPORTED: libcpp-no-if-constexpr // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DEBUG=1 // UNSUPPORTED: libcxx-no-debug-mode diff --git a/libcxx/test/libcxx/debug/containers/db_unord_container_tests.pass.cpp b/libcxx/test/libcxx/debug/containers/db_unord_container_tests.pass.cpp --- a/libcxx/test/libcxx/debug/containers/db_unord_container_tests.pass.cpp +++ b/libcxx/test/libcxx/debug/containers/db_unord_container_tests.pass.cpp @@ -8,7 +8,6 @@ // UNSUPPORTED: c++03, c++11, c++14 // UNSUPPORTED: windows -// UNSUPPORTED: libcpp-no-if-constexpr // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DEBUG=1 // UNSUPPORTED: libcxx-no-debug-mode diff --git a/libcxx/test/libcxx/debug/db_string_view.pass.cpp b/libcxx/test/libcxx/debug/db_string_view.pass.cpp --- a/libcxx/test/libcxx/debug/db_string_view.pass.cpp +++ b/libcxx/test/libcxx/debug/db_string_view.pass.cpp @@ -8,7 +8,6 @@ // UNSUPPORTED: c++03, c++11, c++14 // UNSUPPORTED: windows -// UNSUPPORTED: libcpp-no-if-constexpr // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DEBUG=1 // UNSUPPORTED: libcxx-no-debug-mode diff --git a/libcxx/test/support/container_debug_tests.h b/libcxx/test/support/container_debug_tests.h --- a/libcxx/test/support/container_debug_tests.h +++ b/libcxx/test/support/container_debug_tests.h @@ -33,11 +33,6 @@ #error This header may only be used in C++17 and greater #endif -#ifndef __cpp_if_constexpr -#error These tests require if constexpr -#endif - - namespace IteratorDebugChecks { enum ContainerType { diff --git a/libcxx/utils/libcxx/test/features.py b/libcxx/utils/libcxx/test/features.py --- a/libcxx/utils/libcxx/test/features.py +++ b/libcxx/utils/libcxx/test/features.py @@ -36,7 +36,6 @@ Feature(name='-fsized-deallocation', when=lambda cfg: hasCompileFlag(cfg, '-fsized-deallocation')), Feature(name='-faligned-allocation', when=lambda cfg: hasCompileFlag(cfg, '-faligned-allocation')), Feature(name='fdelayed-template-parsing', when=lambda cfg: hasCompileFlag(cfg, '-fdelayed-template-parsing')), - Feature(name='libcpp-no-if-constexpr', when=lambda cfg: '__cpp_if_constexpr' not in featureTestMacros(cfg)), Feature(name='libcpp-no-structured-bindings', when=lambda cfg: '__cpp_structured_bindings' not in featureTestMacros(cfg)), Feature(name='libcpp-no-concepts', when=lambda cfg: featureTestMacros(cfg).get('__cpp_concepts', 0) < 201907), Feature(name='has-fobjc-arc', when=lambda cfg: hasCompileFlag(cfg, '-xobjective-c++ -fobjc-arc') and