2 files changed, 8 insertions, 0 deletions
diff --git a/libcxx/test/std/experimental/utilities/tuple/tuple.apply/constexpr_types.pass.cpp b/libcxx/test/std/experimental/utilities/tuple/tuple.apply/constexpr_types.pass.cpp
index 5b8a8f09d1e..2d700486f26 100644
--- a/libcxx/test/std/experimental/utilities/tuple/tuple.apply/constexpr_types.pass.cpp
+++ b/libcxx/test/std/experimental/utilities/tuple/tuple.apply/constexpr_types.pass.cpp
@@ -9,6 +9,11 @@
 
 // UNSUPPORTED: c++98, c++03, c++11
 
+// TODO(ericwf)
+// constexpr support temporarily reverted due to bug:
+// https://llvm.org/bugs/show_bug.cgi?id=23141
+// XFAIL: *
+
 // <experimental/tuple>
 
 // template <class F, class T> constexpr decltype(auto) apply(F &&, T &&)
diff --git a/libcxx/test/std/experimental/utilities/tuple/tuple.apply/ref_qualifiers.pass.cpp b/libcxx/test/std/experimental/utilities/tuple/tuple.apply/ref_qualifiers.pass.cpp
index 64ee66e6dec..3cf259f531c 100644
--- a/libcxx/test/std/experimental/utilities/tuple/tuple.apply/ref_qualifiers.pass.cpp
+++ b/libcxx/test/std/experimental/utilities/tuple/tuple.apply/ref_qualifiers.pass.cpp
@@ -32,6 +32,8 @@ namespace ex = std::experimental;
 
 int main()
 {
+// TODO(ericwf): Re-enable constexpr support
+/*
     {
         constexpr func_obj f;
         constexpr std::tuple<> tp;
@@ -39,6 +41,7 @@ int main()
         static_assert(1 == ex::apply(static_cast<func_obj const &>(f), tp), "");
         static_assert(2 == ex::apply(static_cast<func_obj const &&>(f), tp), "");
     }
+*/
     {
         func_obj f;
         std::tuple<> tp;