Revert "[libc++] Fix PR35491 - std::array of zero-size doesn't work with non-default constructible types."

Revert "Fix initialization of array<const T, 0> with GCC."
Revert "Make array<const T, 0> non-CopyAssignable and make swap and fill ill-formed."

This reverts commit r324182, r324185, and r324194 which were causing issues with zero-length std::arrays.

llvm-svn: 324309

2 files changed, 0 insertions, 110 deletions

diff --git a/libcxx/test/std/containers/sequences/array/array.cons/default.pass.cpp b/libcxx/test/std/containers/sequences/array/array.cons/default.pass.cpp
index 9a2a6eaa307..7bc62b759c3 100644
--- a/libcxx/test/std/containers/sequences/array/array.cons/default.pass.cpp
+++ b/libcxx/test/std/containers/sequences/array/array.cons/default.pass.cpp
@@ -14,14 +14,6 @@
 #include <array>
 #include <cassert>
 
-// std::array is explicitly allowed to be initialized with A a = { init-list };.
-// Disable the missing braces warning for this reason.
-#include "disable_missing_braces_warning.h"
-
-struct NoDefault {
-  NoDefault(int) {}
-};
-
 int main()
 {
     {
@@ -36,13 +28,4 @@ int main()
         C c;
         assert(c.size() == 0);
     }
-    {
-      typedef std::array<NoDefault, 0> C;
-      C c;
-      assert(c.size() == 0);
-      C c1 = {};
-      assert(c1.size() == 0);
-      C c2 = {{}};
-      assert(c2.size() == 0);
-    }
 }
diff --git a/libcxx/test/std/containers/sequences/array/array.cons/implicit_copy.pass.cpp b/libcxx/test/std/containers/sequences/array/array.cons/implicit_copy.pass.cpp
deleted file mode 100644
index a8434c01894..00000000000
--- a/libcxx/test/std/containers/sequences/array/array.cons/implicit_copy.pass.cpp
+++ /dev/null
@@ -1,93 +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.
-//
-//===----------------------------------------------------------------------===//
-
-// <array>
-
-// implicitly generated array constructors / assignment operators
-
-#include <array>
-#include <type_traits>
-#include <cassert>
-#include "test_macros.h"
-
-// std::array is explicitly allowed to be initialized with A a = { init-list };.
-// Disable the missing braces warning for this reason.
-#include "disable_missing_braces_warning.h"
-
-// In C++03 the copy assignment operator is not deleted when the implicitly
-// generated operator would be ill-formed; like in the case of a struct with a
-// const member.
-#if TEST_STD_VER < 11
-#define TEST_NOT_COPY_ASSIGNABLE(T) ((void)0)
-#else
-#define TEST_NOT_COPY_ASSIGNABLE(T) static_assert(!std::is_copy_assignable<T>::value, "")
-#endif
-
-struct NoDefault {
-  NoDefault(int) {}
-};
-
-int main() {
-  {
-    typedef double T;
-    typedef std::array<T, 3> C;
-    C c = {1.1, 2.2, 3.3};
-    C c2 = c;
-    c2 = c;
-    static_assert(std::is_copy_constructible<C>::value, "");
-    static_assert(std::is_copy_assignable<C>::value, "");
-  }
-  {
-    typedef double T;
-    typedef std::array<const T, 3> C;
-    C c = {1.1, 2.2, 3.3};
-    C c2 = c;
-    ((void)c2);
-    static_assert(std::is_copy_constructible<C>::value, "");
-    TEST_NOT_COPY_ASSIGNABLE(C);
-  }
-  {
-    typedef double T;
-    typedef std::array<T, 0> C;
-    C c = {};
-    C c2 = c;
-    c2 = c;
-    static_assert(std::is_copy_constructible<C>::value, "");
-    static_assert(std::is_copy_assignable<C>::value, "");
-  }
-  {
-    // const arrays of size 0 should disable the implicit copy assignment operator.
-    typedef double T;
-    typedef std::array<const T, 0> C;
-    C c = {};
-    C c2 = c;
-    ((void)c2);
-    static_assert(std::is_copy_constructible<C>::value, "");
-    TEST_NOT_COPY_ASSIGNABLE(C);
-  }
-  {
-    typedef NoDefault T;
-    typedef std::array<T, 0> C;
-    C c = {};
-    C c2 = c;
-    c2 = c;
-    static_assert(std::is_copy_constructible<C>::value, "");
-    static_assert(std::is_copy_assignable<C>::value, "");
-  }
-  {
-    typedef NoDefault T;
-    typedef std::array<const T, 0> C;
-    C c = {};
-    C c2 = c;
-    ((void)c2);
-    static_assert(std::is_copy_constructible<C>::value, "");
-    TEST_NOT_COPY_ASSIGNABLE(C);
-  }
-
-}