summaryrefslogtreecommitdiffstats
path: root/libcxx/test/std/containers/sequences
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2018-02-04 01:03:08 +0000
committerEric Fiselier <eric@efcs.ca>2018-02-04 01:03:08 +0000
commitafeda5c251f9a4696ab9178ecc6d4be7af72c105 (patch)
treef49c0a1be7b9f7fa4694596d7bd34f775ca19669 /libcxx/test/std/containers/sequences
parentfc5bd023dd9654c09267c287c3d26ddceeaf4161 (diff)
downloadbcm5719-llvm-afeda5c251f9a4696ab9178ecc6d4be7af72c105.tar.gz
bcm5719-llvm-afeda5c251f9a4696ab9178ecc6d4be7af72c105.zip
[libc++] Fix PR35491 - std::array of zero-size doesn't work with non-default constructible types.
Summary: This patch fixes llvm.org/PR35491 and LWG2157 (https://cplusplus.github.io/LWG/issue2157) The fix attempts to maintain ABI compatibility by replacing the array with a instance of `aligned_storage`. Reviewers: mclow.lists, EricWF Reviewed By: EricWF Subscribers: lichray, cfe-commits Differential Revision: https://reviews.llvm.org/D41223 llvm-svn: 324182
Diffstat (limited to 'libcxx/test/std/containers/sequences')
-rw-r--r--libcxx/test/std/containers/sequences/array/array.cons/default.pass.cpp17
-rw-r--r--libcxx/test/std/containers/sequences/array/array.data/data.pass.cpp10
-rw-r--r--libcxx/test/std/containers/sequences/array/array.data/data_const.pass.cpp10
-rw-r--r--libcxx/test/std/containers/sequences/array/begin.pass.cpp9
4 files changed, 46 insertions, 0 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 7bc62b759c3..9a2a6eaa307 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,6 +14,14 @@
#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()
{
{
@@ -28,4 +36,13 @@ 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.data/data.pass.cpp b/libcxx/test/std/containers/sequences/array/array.data/data.pass.cpp
index d7aed70c98a..7b510c203f8 100644
--- a/libcxx/test/std/containers/sequences/array/array.data/data.pass.cpp
+++ b/libcxx/test/std/containers/sequences/array/array.data/data.pass.cpp
@@ -36,4 +36,14 @@ int main()
T* p = c.data();
(void)p; // to placate scan-build
}
+ {
+ struct NoDefault {
+ NoDefault(int) {}
+ };
+ typedef NoDefault T;
+ typedef std::array<T, 0> C;
+ C c = {};
+ T* p = c.data();
+ assert(p != nullptr);
+ }
}
diff --git a/libcxx/test/std/containers/sequences/array/array.data/data_const.pass.cpp b/libcxx/test/std/containers/sequences/array/array.data/data_const.pass.cpp
index 5be082eeb84..f10d51580dd 100644
--- a/libcxx/test/std/containers/sequences/array/array.data/data_const.pass.cpp
+++ b/libcxx/test/std/containers/sequences/array/array.data/data_const.pass.cpp
@@ -38,6 +38,16 @@ int main()
const T* p = c.data();
(void)p; // to placate scan-build
}
+ {
+ struct NoDefault {
+ NoDefault(int) {}
+ };
+ typedef NoDefault T;
+ typedef std::array<T, 0> C;
+ const C c = {};
+ const T* p = c.data();
+ assert(p != nullptr);
+ }
#if TEST_STD_VER > 14
{
typedef std::array<int, 5> C;
diff --git a/libcxx/test/std/containers/sequences/array/begin.pass.cpp b/libcxx/test/std/containers/sequences/array/begin.pass.cpp
index b12ffc851b8..8cdef466a8f 100644
--- a/libcxx/test/std/containers/sequences/array/begin.pass.cpp
+++ b/libcxx/test/std/containers/sequences/array/begin.pass.cpp
@@ -31,4 +31,13 @@ int main()
*i = 5.5;
assert(c[0] == 5.5);
}
+ {
+ struct NoDefault {
+ NoDefault(int) {}
+ };
+ typedef NoDefault T;
+ typedef std::array<T, 0> C;
+ C c = {};
+ assert(c.begin() == c.end());
+ }
}
OpenPOWER on IntegriCloud