replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix initialization of array<const T, 0> with GCC. 

Previously, when handling zero-sized array of const objects we
used a const version of aligned_storage_t, which is not an array type.
However, GCC complains about initialization of the form: array<const T, 0> arr = {};

This patch fixes that bug by making the dummy object used to represent
the zero-sized array an array itself. This avoids GCC's complaints
about the uninitialized const member.

llvm-svn: 324194
This commit is contained in:
Eric Fiselier 2018-02-04 08:02:35 +00:00
parent 4f0c85310d
commit c6b3c7bb63
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libcxx/include/array
View File

@ -146,21 +146,19 @@ struct __array_traits {
template <class _Tp>
struct __array_traits<_Tp, 0> {
typedef typename aligned_storage<sizeof(_Tp), alignment_of<_Tp>::value>::type
_NonConstStorageT;
_NonConstStorageT[1];
typedef typename conditional<is_const<_Tp>::value, const _NonConstStorageT,
_NonConstStorageT>::type _StorageT;
typedef typename remove_const<_Tp>::type _NonConstTp;
_LIBCPP_INLINE_VISIBILITY
static _NonConstTp* __data(_NonConstStorageT& __store) {
_StorageT *__ptr = std::addressof(__store);
return reinterpret_cast<_NonConstTp*>(__ptr);
static _NonConstTp* __data(_NonConstStorageT &__store) {
return reinterpret_cast<_NonConstTp*>(__store);
}
_LIBCPP_INLINE_VISIBILITY
static const _Tp* __data(const _StorageT& __store) {
const _StorageT *__ptr = std::addressof(__store);
return reinterpret_cast<const _Tp*>(__ptr);
static const _Tp* __data(const _StorageT &__store) {
return reinterpret_cast<const _Tp*>(__store);
}
_LIBCPP_INLINE_VISIBILITY