Revert r289727 due to PR31384

This patch reverts the changes to tuple which fixed construction from
types derived from tuple. It breaks the code mentioned in llvm.org/PR31384.
I'll follow this commit up with a test case.

llvm-svn: 289773

1 files changed, 0 insertions, 154 deletions

diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/derived_from_tuple_like.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/derived_from_tuple_like.pass.cpp
deleted file mode 100644
index 53b1e302923..00000000000
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/derived_from_tuple_like.pass.cpp
+++ /dev/null
@@ -1,154 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <tuple>
-
-// template <class... Types> class tuple;
-
-// template <class... UTypes>
-//   tuple& operator=(const tuple<UTypes...>& u);
-
-// UNSUPPORTED: c++98, c++03
-
-#include <tuple>
-#include <array>
-#include <string>
-#include <utility>
-#include <cassert>
-
-#include "propagate_value_category.hpp"
-
-template <bool Explicit = false>
-struct TracksIntQuals {
-  TracksIntQuals() : value(-1), value_category(VC_None), assigned(false) {}
-
-  template <
-      class Tp,
-      typename std::enable_if<Explicit &&
-                                  !std::is_same<typename std::decay<Tp>::type,
-                                                TracksIntQuals>::value,
-                              bool>::type = false>
-  explicit TracksIntQuals(Tp &&x)
-      : value(x), value_category(getValueCategory<Tp &&>()), assigned(false) {
-    static_assert(std::is_same<UnCVRef<Tp>, int>::value, "");
-  }
-
-  template <
-      class Tp,
-      typename std::enable_if<!Explicit &&
-                                  !std::is_same<typename std::decay<Tp>::type,
-                                                TracksIntQuals>::value,
-                              bool>::type = false>
-  TracksIntQuals(Tp &&x)
-      : value(x), value_category(getValueCategory<Tp &&>()), assigned(false) {
-    static_assert(std::is_same<UnCVRef<Tp>, int>::value, "");
-  }
-
-  template <class Tp,
-            class = typename std::enable_if<!std::is_same<
-                typename std::decay<Tp>::type, TracksIntQuals>::value>::type>
-  TracksIntQuals &operator=(Tp &&x) {
-    static_assert(std::is_same<UnCVRef<Tp>, int>::value, "");
-    value = x;
-    value_category = getValueCategory<Tp &&>();
-    assigned = true;
-    return *this;
-  }
-
-  void reset() {
-    value = -1;
-    value_category = VC_None;
-    assigned = false;
-  }
-
-  bool checkConstruct(int expect, ValueCategory expect_vc) const {
-    return value != 1 && value == expect && value_category == expect_vc &&
-           assigned == false;
-  }
-
-  bool checkAssign(int expect, ValueCategory expect_vc) const {
-    return value != 1 && value == expect && value_category == expect_vc &&
-           assigned == true;
-  }
-
-  int value;
-  ValueCategory value_category;
-  bool assigned;
-};
-
-template <class Tup>
-struct DerivedFromTup : Tup {
-  using Tup::Tup;
-};
-
-template <ValueCategory VC>
-void do_derived_construct_test() {
-  using Tup1 = std::tuple<long, TracksIntQuals</*Explicit*/ false>>;
-  {
-    DerivedFromTup<std::tuple<int, int>> d(42, 101);
-    Tup1 t = ValueCategoryCast<VC>(d);
-    assert(std::get<0>(t) == 42);
-    assert(std::get<1>(t).checkConstruct(101, VC));
-  }
-  {
-    DerivedFromTup<std::pair<int, int>> d(42, 101);
-    Tup1 t = ValueCategoryCast<VC>(d);
-    assert(std::get<0>(t) == 42);
-    assert(std::get<1>(t).checkConstruct(101, VC));
-  }
-  {
-    DerivedFromTup<std::array<int, 2>> d;
-    d[0] = 42;
-    d[1] = 101;
-    Tup1 t = ValueCategoryCast<VC>(d);
-    assert(std::get<0>(t) == 42);
-    assert(std::get<1>(t).checkConstruct(101, VC));
-  }
-
-  using Tup2 = std::tuple<long, TracksIntQuals</*Explicit*/ true>>;
-  {
-    using D = DerivedFromTup<std::tuple<int, int>>;
-    static_assert(!std::is_convertible<ApplyValueCategoryT<VC, D>, Tup2>::value,
-                  "");
-    D d(42, 101);
-    Tup2 t(ValueCategoryCast<VC>(d));
-    assert(std::get<0>(t) == 42);
-    assert(std::get<1>(t).checkConstruct(101, VC));
-  }
-  {
-    using D = DerivedFromTup<std::pair<int, int>>;
-    static_assert(!std::is_convertible<ApplyValueCategoryT<VC, D>, Tup2>::value,
-                  "");
-    D d(42, 101);
-    Tup2 t(ValueCategoryCast<VC>(d));
-    assert(std::get<0>(t) == 42);
-    assert(std::get<1>(t).checkConstruct(101, VC));
-  }
-  {
-    using D = DerivedFromTup<std::array<int, 2>>;
-    static_assert(!std::is_convertible<ApplyValueCategoryT<VC, D>, Tup2>::value,
-                  "");
-    D d;
-    d[0] = 42;
-    d[1] = 101;
-    Tup2 t(ValueCategoryCast<VC>(d));
-    assert(std::get<0>(t) == 42);
-    assert(std::get<1>(t).checkConstruct(101, VC));
-  }
-}
-
-int main() {
-  do_derived_construct_test<VC_LVal | VC_Const>();
-  do_derived_construct_test<VC_RVal>();
-#if defined(_LIBCPP_VERSION)
-  // Supporting non-const copy and const move are libc++ extensions
-  do_derived_construct_test<VC_LVal>();
-  do_derived_construct_test<VC_RVal | VC_Const>();
-#endif
-}