Fix size and alignment of array<T, 0>.
An array T[1] isn't necessarily the same say when it's
a member of a struct. This patch addresses that problem and corrects
the tests to deal with it.
llvm-svn: 324545
Cr-Mirrored-From: sso://chromium.googlesource.com/_direct/external/github.com/llvm/llvm-project
Cr-Mirrored-Commit: 1a78ae3c895d0520bbb8ad2f154e737d52fe7ae2
diff --git a/include/__config b/include/__config
index a4acbca..cfe4ef0 100644
--- a/include/__config
+++ b/include/__config
@@ -582,6 +582,7 @@
#define __alignof__ __alignof
#define _LIBCPP_NORETURN __declspec(noreturn)
#define _ALIGNAS(x) __declspec(align(x))
+#define _ALIGNAS_TYPE(x) alignas(x)
#define _LIBCPP_HAS_NO_VARIADICS
#define _LIBCPP_BEGIN_NAMESPACE_STD namespace std {
diff --git a/include/array b/include/array
index 706e573..fdb1f9d 100644
--- a/include/array
+++ b/include/array
@@ -244,10 +244,11 @@
typedef std::reverse_iterator<iterator> reverse_iterator;
typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
-
typedef typename conditional<is_const<_Tp>::value, const char,
char>::type _CharType;
- _ALIGNAS(alignment_of<_Tp[1]>::value) _CharType __elems_[sizeof(_Tp[1])];
+
+ struct _ArrayInStructT { _Tp __data_[1]; };
+ _ALIGNAS_TYPE(_ArrayInStructT) _CharType __elems_[sizeof(_ArrayInStructT)];
// No explicit construct/copy/destroy for aggregate type
_LIBCPP_INLINE_VISIBILITY void fill(const value_type&) {
diff --git a/test/std/containers/sequences/array/size_and_alignment.pass.cpp b/test/std/containers/sequences/array/size_and_alignment.pass.cpp
index d01e1ce..966d063 100644
--- a/test/std/containers/sequences/array/size_and_alignment.pass.cpp
+++ b/test/std/containers/sequences/array/size_and_alignment.pass.cpp
@@ -21,12 +21,26 @@
#include "test_macros.h"
+
+template <class T, size_t Size>
+struct MyArray {
+ T elems[Size];
+};
+
template <class T, size_t Size>
void test() {
typedef T CArrayT[Size == 0 ? 1 : Size];
typedef std::array<T, Size> ArrayT;
- static_assert(sizeof(CArrayT) == sizeof(ArrayT), "");
- static_assert(TEST_ALIGNOF(CArrayT) == TEST_ALIGNOF(ArrayT), "");
+ typedef MyArray<T, Size == 0 ? 1 : Size> MyArrayT;
+ static_assert(sizeof(ArrayT) == sizeof(CArrayT), "");
+ static_assert(sizeof(ArrayT) == sizeof(MyArrayT), "");
+ static_assert(TEST_ALIGNOF(ArrayT) == TEST_ALIGNOF(MyArrayT), "");
+#if defined(_LIBCPP_VERSION)
+ ArrayT a;
+ ((void)a);
+ static_assert(sizeof(ArrayT) == sizeof(a.__elems_), "");
+ static_assert(TEST_ALIGNOF(ArrayT) == __alignof__(a.__elems_), "");
+#endif
}
template <class T>
@@ -44,6 +58,8 @@
char data[1000];
};
+//static_assert(sizeof(void*) == 4, "");
+
int main() {
test_type<char>();
test_type<int>();