1c0cedccb6
Summary:
The constructors `vector(Iter, Iter, Alloc = Alloc{})` and `assign(Iter, Iter)` don't correctly perform EmplaceConstruction from the result of dereferencing the iterator. This results in them performing an additional and unneeded copy.
This patch addresses the issue by correctly using `emplace_back` in C++11 and newer.
There are also some bugs in our `insert` implementation, but those will be handled separately.
@mclow.lists We should probably merge this into 5.1, agreed?
Reviewers: mclow.lists, dlj, EricWF
Reviewed By: mclow.lists, EricWF
Subscribers: cfe-commits, mclow.lists
Differential Revision: https://reviews.llvm.org/D38757
llvm-svn: 315994
113 lines
3.3 KiB
C++
113 lines
3.3 KiB
C++
//===----------------------------------------------------------------------===//
|
|
//
|
|
// 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.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
// <deque>
|
|
|
|
// template <class InputIterator> deque(InputIterator f, InputIterator l);
|
|
|
|
#include <deque>
|
|
#include <cassert>
|
|
#include <cstddef>
|
|
|
|
#include "test_macros.h"
|
|
#include "test_allocator.h"
|
|
#include "test_iterators.h"
|
|
#include "min_allocator.h"
|
|
#if TEST_STD_VER >= 11
|
|
#include "emplace_constructible.h"
|
|
#endif
|
|
|
|
template <class InputIterator>
|
|
void
|
|
test(InputIterator f, InputIterator l)
|
|
{
|
|
typedef typename std::iterator_traits<InputIterator>::value_type T;
|
|
typedef std::allocator<T> Allocator;
|
|
typedef std::deque<T, Allocator> C;
|
|
typedef typename C::const_iterator const_iterator;
|
|
C d(f, l);
|
|
assert(d.size() == static_cast<std::size_t>(std::distance(f, l)));
|
|
assert(static_cast<std::size_t>(distance(d.begin(), d.end())) == d.size());
|
|
for (const_iterator i = d.begin(), e = d.end(); i != e; ++i, ++f)
|
|
assert(*i == *f);
|
|
}
|
|
|
|
template <class Allocator, class InputIterator>
|
|
void
|
|
test(InputIterator f, InputIterator l)
|
|
{
|
|
typedef typename std::iterator_traits<InputIterator>::value_type T;
|
|
typedef std::deque<T, Allocator> C;
|
|
typedef typename C::const_iterator const_iterator;
|
|
C d(f, l);
|
|
assert(d.size() == static_cast<std::size_t>(std::distance(f, l)));
|
|
assert(static_cast<std::size_t>(distance(d.begin(), d.end())) == d.size());
|
|
for (const_iterator i = d.begin(), e = d.end(); i != e; ++i, ++f)
|
|
assert(*i == *f);
|
|
}
|
|
|
|
void basic_test()
|
|
{
|
|
int ab[] = {3, 4, 2, 8, 0, 1, 44, 34, 45, 96, 80, 1, 13, 31, 45};
|
|
int* an = ab + sizeof(ab)/sizeof(ab[0]);
|
|
test(input_iterator<const int*>(ab), input_iterator<const int*>(an));
|
|
test(forward_iterator<const int*>(ab), forward_iterator<const int*>(an));
|
|
test(bidirectional_iterator<const int*>(ab), bidirectional_iterator<const int*>(an));
|
|
test(random_access_iterator<const int*>(ab), random_access_iterator<const int*>(an));
|
|
test<limited_allocator<int, 4096> >(ab, an);
|
|
#if TEST_STD_VER >= 11
|
|
test<min_allocator<int> >(ab, an);
|
|
#endif
|
|
}
|
|
|
|
|
|
void test_emplacable_concept() {
|
|
#if TEST_STD_VER >= 11
|
|
int arr1[] = {42};
|
|
int arr2[] = {1, 101, 42};
|
|
{
|
|
using T = EmplaceConstructibleAndMoveable<int>;
|
|
using It = random_access_iterator<int*>;
|
|
{
|
|
std::deque<T> v(It(arr1), It(std::end(arr1)));
|
|
assert(v[0].value == 42);
|
|
}
|
|
{
|
|
std::deque<T> v(It(arr2), It(std::end(arr2)));
|
|
assert(v[0].value == 1);
|
|
assert(v[1].value == 101);
|
|
assert(v[2].value == 42);
|
|
}
|
|
}
|
|
{
|
|
using T = EmplaceConstructibleAndMoveable<int>;
|
|
using It = input_iterator<int*>;
|
|
{
|
|
std::deque<T> v(It(arr1), It(std::end(arr1)));
|
|
assert(v[0].copied == 0);
|
|
assert(v[0].value == 42);
|
|
}
|
|
{
|
|
std::deque<T> v(It(arr2), It(std::end(arr2)));
|
|
//assert(v[0].copied == 0);
|
|
assert(v[0].value == 1);
|
|
//assert(v[1].copied == 0);
|
|
assert(v[1].value == 101);
|
|
assert(v[2].copied == 0);
|
|
assert(v[2].value == 42);
|
|
}
|
|
}
|
|
#endif
|
|
}
|
|
|
|
int main() {
|
|
basic_test();
|
|
test_emplacable_concept();
|
|
}
|