Add default initialization to compressed_pair.

This change introduces the __default_init_tag to memory, and a corresponding
element constructor to allow for default initialization of either of the pair
values. This is useful for classes such as std::string where most (all)
constructors explicitly initialize the values in the constructor.

Patch by Martijn Vels (mvels@google.com)
Reviewed as https://reviews.llvm.org/D70617
This commit is contained in:
Eric Fiselier 2019-12-16 17:00:10 -05:00
parent 3f22b4721e
commit 0fa118a9da
2 changed files with 58 additions and 0 deletions

View File

@ -2178,6 +2178,9 @@ public:
};
#endif
// Tag used to default initialize one or both of the pair's elements.
struct __default_init_tag {};
template <class _Tp, int _Idx,
bool _CanBeEmptyBase =
is_empty<_Tp>::value && !__libcpp_is_final<_Tp>::value>
@ -2188,6 +2191,8 @@ struct __compressed_pair_elem {
#ifndef _LIBCPP_CXX03_LANG
_LIBCPP_INLINE_VISIBILITY constexpr __compressed_pair_elem() : __value_() {}
_LIBCPP_INLINE_VISIBILITY constexpr
__compressed_pair_elem(__default_init_tag) {}
template <class _Up, class = typename enable_if<
!is_same<__compressed_pair_elem, typename decay<_Up>::type>::value
@ -2207,6 +2212,8 @@ struct __compressed_pair_elem {
#else
_LIBCPP_INLINE_VISIBILITY __compressed_pair_elem() : __value_() {}
_LIBCPP_INLINE_VISIBILITY
__compressed_pair_elem(__default_init_tag) {}
_LIBCPP_INLINE_VISIBILITY
__compressed_pair_elem(_ParamT __p) : __value_(std::forward<_ParamT>(__p)) {}
#endif

View File

@ -0,0 +1,51 @@
//===----------------------------------------------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//
#include <assert.h>
#include <memory>
#include "test_macros.h"
typedef std::__compressed_pair<int, unsigned> IntPair;
void test_constructor() {
IntPair value;
assert(value.first() == 0);
assert(value.second() == 0);
value.first() = 1;
value.second() = 2;
new (&value) IntPair;
assert(value.first() == 0);
assert(value.second() == 0);
}
void test_constructor_default_init() {
IntPair value;
value.first() = 1;
value.second() = 2;
new (&value) IntPair(std::__default_init_tag(), 3);
assert(value.first() == 1);
assert(value.second() == 3);
new (&value) IntPair(4, std::__default_init_tag());
assert(value.first() == 4);
assert(value.second() == 3);
new (&value) IntPair(std::__default_init_tag(), std::__default_init_tag());
assert(value.first() == 4);
assert(value.second() == 3);
}
int main(int, char**)
{
test_constructor();
test_constructor_default_init();
return 0;
}