Index: libcxx/include/memory =================================================================== --- libcxx/include/memory +++ libcxx/include/memory @@ -1459,24 +1459,102 @@ #else // _LIBCPP_CXX03_LANG -#ifndef _LIBCPP_HAS_NO_VARIADICS +template +struct __has_construct_test_0 +{ +private: + template static true_type __test(void (_Xp::*)(_Pointer)); + template static false_type __test(...); -template -struct __has_construct - : false_type + template + static decltype(__test(&_Xp::construct)) __test_exist(decltype(&_Xp::construct)); + template static false_type __test_exist(...); + + typedef decltype(__test_exist<_Alloc>(0)) type; +public: + static const bool value = type::value; +}; + +template +struct __has_construct_0 + : integral_constant::value> { }; -#else // _LIBCPP_HAS_NO_VARIADICS +template +struct __has_construct_test_1 +{ +private: + template static true_type __test(void (_Xp::*)(_Pointer, _A0)); + template static false_type __test(...); + + template + static decltype(__test(&_Xp::construct)) __test_exist(decltype(&_Xp::construct)); + template static false_type __test_exist(...); + + typedef decltype(__test_exist<_Alloc>(0)) type; +public: + static const bool value = type::value; +}; + +template +struct __has_construct_1 + : integral_constant::value> +{ +}; + +template +struct __has_construct_test_2 +{ +private: + template static true_type __test(void (_Xp::*)(_Pointer, _A0, _A1)); + template static false_type __test(...); + + template + static decltype(__test(&_Xp::construct)) __test_exist(decltype(&_Xp::construct)); + template static false_type __test_exist(...); + + typedef decltype(__test_exist<_Alloc>(0)) type; +public: + static const bool value = type::value; +}; + +template +struct __has_construct_2 + : integral_constant::value> +{ +}; + +template +struct __has_construct_test_3 +{ +private: + template static true_type __test(void (_Xp::*)(_Pointer, _A0, _A1, _A2)); + template static false_type __test(...); + + template + static decltype(__test(&_Xp::construct)) __test_exist(decltype(&_Xp::construct)); + template static false_type __test_exist(...); + + typedef decltype(__test_exist<_Alloc>(0)) type; +public: + static const bool value = type::value; +}; + +template +struct __has_construct_3 + : integral_constant::value> +{ +}; template struct __has_construct - : false_type + : integral_constant::value + || __has_construct_test_1<_Alloc, _Pointer, const _Args&>::value> { }; -#endif // _LIBCPP_HAS_NO_VARIADICS - template struct __has_destroy : false_type @@ -1564,29 +1642,33 @@ #else // _LIBCPP_HAS_NO_VARIADICS template _LIBCPP_INLINE_VISIBILITY - static void construct(allocator_type&, _Tp* __p) + static void construct(allocator_type& __a, _Tp* __p) { - ::new ((void*)__p) _Tp(); + __construct(__has_construct_0(), __a, + __p); } template _LIBCPP_INLINE_VISIBILITY - static void construct(allocator_type&, _Tp* __p, const _A0& __a0) + static void construct(allocator_type& __a, _Tp* __p, const _A0& __a0) { - ::new ((void*)__p) _Tp(__a0); + __construct(__has_construct_1(), + __a, __p, __a0); } template _LIBCPP_INLINE_VISIBILITY - static void construct(allocator_type&, _Tp* __p, const _A0& __a0, + static void construct(allocator_type& __a, _Tp* __p, const _A0& __a0, const _A1& __a1) { - ::new ((void*)__p) _Tp(__a0, __a1); + __construct(__has_construct_2(), + __a, __p, __a0, __a1); } template _LIBCPP_INLINE_VISIBILITY - static void construct(allocator_type&, _Tp* __p, const _A0& __a0, + static void construct(allocator_type& __a, _Tp* __p, const _A0& __a0, const _A1& __a1, const _A2& __a2) { - ::new ((void*)__p) _Tp(__a0, __a1, __a2); + __construct(__has_construct_3(), + __a, __p, __a0, __a1, __a2); } #endif // _LIBCPP_HAS_NO_VARIADICS @@ -1646,23 +1728,23 @@ construct(__a, _VSTD::__to_raw_pointer(__begin2), *__begin1); } - template + template _LIBCPP_INLINE_VISIBILITY static typename enable_if < - (is_same >::value - || !__has_construct::value) && - is_trivially_move_constructible<_Tp>::value, + (is_same::type> >::value + || is_same >::value) && + is_trivially_move_constructible<_DestTp>::value, void >::type - __construct_range_forward(allocator_type&, _Tp* __begin1, _Tp* __end1, _Tp*& __begin2) + __construct_range_forward(allocator_type&, _SourceTp* __begin1, _SourceTp* __end1, _DestTp*& __begin2) { - typedef typename remove_const<_Tp>::type _Vp; + typedef typename remove_const<_DestTp>::type _Vp; ptrdiff_t _Np = __end1 - __begin1; if (_Np > 0) { - _VSTD::memcpy(const_cast<_Vp*>(__begin2), __begin1, _Np * sizeof(_Tp)); + _VSTD::memcpy(const_cast<_Vp*>(__begin2), __begin1, _Np * sizeof(_DestTp)); __begin2 += _Np; } } @@ -1720,6 +1802,53 @@ { ::new ((void*)__p) _Tp(_VSTD::forward<_Args>(__args)...); } +#else // _LIBCPP_HAS_NO_VARIADICS + template + _LIBCPP_INLINE_VISIBILITY + static void __construct(true_type, allocator_type& __a, _Tp* __p) + {__a.construct(__p);} + template + _LIBCPP_INLINE_VISIBILITY + static void __construct(false_type, allocator_type&, _Tp* __p) + { + ::new ((void*)__p) _Tp(); + } + template + _LIBCPP_INLINE_VISIBILITY + static void __construct(true_type, allocator_type& __a, _Tp* __p, + const _A0& __a0) + {__a.construct(__p, __a0);} + template + _LIBCPP_INLINE_VISIBILITY + static void __construct(false_type, allocator_type&, _Tp* __p, + const _A0& __a0) + { + ::new ((void*)__p) _Tp(__a0); + } + template + _LIBCPP_INLINE_VISIBILITY + static void __construct(true_type, allocator_type& __a, _Tp* __p, + const _A0& __a0, const _A1& __a1) + {__a.construct(__p, __a0, __a1);} + template + _LIBCPP_INLINE_VISIBILITY + static void __construct(false_type, allocator_type&, _Tp* __p, + const _A0& __a0, const _A1& __a1) + { + ::new ((void*)__p) _Tp(__a0, __a1); + } + template + _LIBCPP_INLINE_VISIBILITY + static void __construct(true_type, allocator_type& __a, _Tp* __p, + const _A0& __a0, const _A1& __a1, const _A2& __a2) + {__a.construct(__p, __a0, __a1, __a2);} + template + _LIBCPP_INLINE_VISIBILITY + static void __construct(false_type, allocator_type&, _Tp* __p, + const _A0& __a0, const _A1& __a1, const _A2& __a2) + { + ::new ((void*)__p) _Tp(__a0, __a1, __a2); + } #endif // _LIBCPP_HAS_NO_VARIADICS template Index: libcxx/test/std/containers/sequences/vector/vector.cons/construct_iter_iter_alloc.pass.cpp =================================================================== --- libcxx/test/std/containers/sequences/vector/vector.cons/construct_iter_iter_alloc.pass.cpp +++ libcxx/test/std/containers/sequences/vector/vector.cons/construct_iter_iter_alloc.pass.cpp @@ -50,6 +50,26 @@ #endif +template +struct cpp03_allocator : bare_allocator { + typedef T value_type; + typedef value_type* pointer; + + static bool construct_called; + + void construct(pointer p, const value_type& val) + { + ::new(p) value_type(val); + construct_called = true; + } + + std::size_t max_size() const + { + return UINT_MAX / sizeof(T); + } +}; +template bool cpp03_allocator::construct_called = false; + void basic_tests() { { int a[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 8, 7, 6, 5, 4, 3, 1, 0}; @@ -129,9 +149,22 @@ } void test_ctor_under_alloc() { -#if TEST_STD_VER >= 11 int arr1[] = {42}; int arr2[] = {1, 101, 42}; + { + typedef std::vector > C; + { + cpp03_allocator::construct_called = false; + C v(arr1, arr1 + 1); + assert(cpp03_allocator::construct_called); + } + { + cpp03_allocator::construct_called = false; + C v(arr2, arr2 + 3); + assert(cpp03_allocator::construct_called); + } + } +#if TEST_STD_VER >= 11 { using C = TCT::vector<>; using T = typename C::value_type; @@ -162,6 +195,17 @@ //C v(It(arr2), It(std::end(arr2)), a); } } + { + using C = std::vector >; + { + ExpectConstructGuard G(1); + C v(arr1, arr1 + 1); + } + { + ExpectConstructGuard G(3); + C v(arr2, arr2 + 3); + } + } #endif } Index: libcxx/test/std/containers/sequences/vector/vector.cons/construct_iter_iter_different_value_type.pass.cpp =================================================================== --- /dev/null +++ libcxx/test/std/containers/sequences/vector/vector.cons/construct_iter_iter_different_value_type.pass.cpp @@ -0,0 +1,29 @@ +//===----------------------------------------------------------------------===// +// +// 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. +// +//===----------------------------------------------------------------------===// + +// + +// template vector(InputIter first, InputIter last); + +// Initialize a vector with a different value type. Make sure initialization +// is performed with each element value, not with a memory blob. + +#include +#include +#include +#include + +int main() +{ + int array[3] = {0, 1, 2}; + std::vector v(array, array + 3); + assert(std::fabs(v[0] - 0.0f) < FLT_EPSILON); + assert(std::fabs(v[1] - 1.0f) < FLT_EPSILON); + assert(std::fabs(v[2] - 2.0f) < FLT_EPSILON); +}