[libcxx] Fix max_size() across all containers

Summary: The `max_size()` method of containers should respect both the allocator's reported `max_size` and the range of the `difference_type`. This patch makes all containers choose the smallest of those two values.

Reviewers: mclow.lists, EricWF

Subscribers: cfe-commits

Differential Revision: https://reviews.llvm.org/D26885

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@287729 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Fiselier
2016-11-23 01:18:56 +00:00
parent 0373708cdc
commit ef3060ef96
20 changed files with 425 additions and 109 deletions

View File

@@ -1 +1,7 @@
BasedOnStyle: LLVM
---
Language: Cpp
AlwaysBreakTemplateDeclarations: true
---

View File

@@ -1004,8 +1004,11 @@ public:
_LIBCPP_INLINE_VISIBILITY
size_type max_size() const _NOEXCEPT
{
return allocator_traits<__pointer_allocator>::max_size(
__bucket_list_.get_deleter().__alloc());
return std::min<size_type>(
allocator_traits<__pointer_allocator>::max_size(
__bucket_list_.get_deleter().__alloc()),
numeric_limits<difference_type >::max()
);
}
pair<iterator, bool> __node_insert_unique(__node_pointer __nd);
@@ -1192,7 +1195,7 @@ public:
_LIBCPP_INLINE_VISIBILITY
size_type max_bucket_count() const _NOEXCEPT
{return __pointer_alloc_traits::max_size(__bucket_list_.get_deleter().__alloc());}
{return max_size(); }
size_type bucket_size(size_type __n) const;
_LIBCPP_INLINE_VISIBILITY float load_factor() const _NOEXCEPT
{

View File

@@ -1106,7 +1106,9 @@ public:
_LIBCPP_INLINE_VISIBILITY
size_type max_size() const _NOEXCEPT
{return __node_traits::max_size(__node_alloc());}
{return std::min<size_type>(
__node_traits::max_size(__node_alloc()),
numeric_limits<difference_type >::max());}
void clear() _NOEXCEPT;

View File

@@ -1310,7 +1310,9 @@ public:
size_type size() const _NOEXCEPT {return __base::size();}
_LIBCPP_INLINE_VISIBILITY
size_type max_size() const _NOEXCEPT
{return __alloc_traits::max_size(__base::__alloc());}
{return std::min<size_type>(
__alloc_traits::max_size(__base::__alloc()),
numeric_limits<difference_type>::max());}
void resize(size_type __n);
void resize(size_type __n, const value_type& __v);
void shrink_to_fit() _NOEXCEPT;

View File

@@ -734,8 +734,11 @@ public:
bool empty() const _NOEXCEPT
{return base::__before_begin()->__next_ == nullptr;}
_LIBCPP_INLINE_VISIBILITY
size_type max_size() const _NOEXCEPT
{return numeric_limits<size_type>::max();}
size_type max_size() const _NOEXCEPT {
return std::min<size_type>(
__node_traits::max_size(base::__alloc()),
numeric_limits<difference_type>::max());
}
_LIBCPP_INLINE_VISIBILITY
reference front() {return base::__before_begin()->__next_->__value_;}

View File

@@ -570,6 +570,10 @@ protected:
const __node_allocator& __node_alloc() const _NOEXCEPT
{return __size_alloc_.second();}
_LIBCPP_INLINE_VISIBILITY
size_type __node_alloc_max_size() const _NOEXCEPT {
return __node_alloc_traits::max_size(__node_alloc());
}
_LIBCPP_INLINE_VISIBILITY
static void __unlink_nodes(__link_pointer __f, __link_pointer __l) _NOEXCEPT;
@@ -904,7 +908,11 @@ public:
bool empty() const _NOEXCEPT {return base::empty();}
_LIBCPP_INLINE_VISIBILITY
size_type max_size() const _NOEXCEPT
{return numeric_limits<difference_type>::max();}
{
return std::min<size_type>(
base::__node_alloc_max_size(),
numeric_limits<difference_type >::max());
}
_LIBCPP_INLINE_VISIBILITY
iterator begin() _NOEXCEPT {return base::begin();}

View File

@@ -941,7 +941,8 @@ template <class _Tp, class _Allocator>
typename vector<_Tp, _Allocator>::size_type
vector<_Tp, _Allocator>::max_size() const _NOEXCEPT
{
return _VSTD::min<size_type>(__alloc_traits::max_size(this->__alloc()), numeric_limits<size_type>::max() / 2); // end() >= begin(), always
return _VSTD::min<size_type>(__alloc_traits::max_size(this->__alloc()),
numeric_limits<difference_type>::max());
}
// Precondition: __new_size > capacity()

View File

@@ -13,23 +13,39 @@
// size_type max_size() const;
#include <map>
#include <cassert>
#include <limits>
#include <map>
#include <type_traits>
#include "min_allocator.h"
#include "test_allocator.h"
#include "test_macros.h"
int main()
{
{
typedef std::map<int, double> M;
M m;
assert(m.max_size() != 0);
typedef std::pair<const int, int> KV;
{
typedef limited_allocator<KV, 10> A;
typedef std::map<int, int, std::less<int>, A> C;
C c;
assert(c.max_size() <= 10);
LIBCPP_ASSERT(c.max_size() == 10);
}
{
typedef limited_allocator<KV, (size_t)-1> A;
typedef std::map<int, int, std::less<int>, A> C;
const C::difference_type max_dist =
std::numeric_limits<C::difference_type>::max();
C c;
assert(c.max_size() <= max_dist);
LIBCPP_ASSERT(c.max_size() == max_dist);
}
#if TEST_STD_VER >= 11
{
typedef std::map<int, double, std::less<int>, min_allocator<std::pair<const int, double>>> M;
M m;
assert(m.max_size() != 0);
typedef std::map<char, int> C;
const C::difference_type max_dist =
std::numeric_limits<C::difference_type>::max();
C c;
assert(c.max_size() <= max_dist);
assert(c.max_size() <= alloc_max_size(c.get_allocator()));
}
#endif
}

View File

@@ -13,23 +13,39 @@
// size_type max_size() const;
#include <map>
#include <cassert>
#include <limits>
#include <map>
#include <type_traits>
#include "min_allocator.h"
#include "test_allocator.h"
#include "test_macros.h"
int main()
{
{
typedef std::multimap<int, double> M;
M m;
assert(m.max_size() != 0);
typedef std::pair<const int, int> KV;
{
typedef limited_allocator<KV, 10> A;
typedef std::multimap<int, int, std::less<int>, A> C;
C c;
assert(c.max_size() <= 10);
LIBCPP_ASSERT(c.max_size() == 10);
}
{
typedef limited_allocator<KV, (size_t)-1> A;
typedef std::multimap<int, int, std::less<int>, A> C;
const C::difference_type max_dist =
std::numeric_limits<C::difference_type>::max();
C c;
assert(c.max_size() <= max_dist);
LIBCPP_ASSERT(c.max_size() == max_dist);
}
#if TEST_STD_VER >= 11
{
typedef std::multimap<int, double, std::less<int>, min_allocator<std::pair<const int, double>>> M;
M m;
assert(m.max_size() != 0);
typedef std::multimap<char, int> C;
const C::difference_type max_dist =
std::numeric_limits<C::difference_type>::max();
C c;
assert(c.max_size() <= max_dist);
assert(c.max_size() <= alloc_max_size(c.get_allocator()));
}
#endif
}

View File

@@ -13,23 +13,38 @@
// size_type max_size() const;
#include <set>
#include <cassert>
#include <limits>
#include <set>
#include <type_traits>
#include "min_allocator.h"
#include "test_allocator.h"
#include "test_macros.h"
int main()
{
{
typedef std::multiset<int> M;
M m;
assert(m.max_size() != 0);
typedef limited_allocator<int, 10> A;
typedef std::multiset<int, std::less<int>, A> C;
C c;
assert(c.max_size() <= 10);
LIBCPP_ASSERT(c.max_size() == 10);
}
#if TEST_STD_VER >= 11
{
typedef std::multiset<int, std::less<int>, min_allocator<int>> M;
M m;
assert(m.max_size() != 0);
typedef limited_allocator<int, (size_t)-1> A;
typedef std::multiset<int, std::less<int>, A> C;
const C::difference_type max_dist =
std::numeric_limits<C::difference_type>::max();
C c;
assert(c.max_size() <= max_dist);
LIBCPP_ASSERT(c.max_size() == max_dist);
}
{
typedef std::multiset<char> C;
const C::difference_type max_dist =
std::numeric_limits<C::difference_type>::max();
C c;
assert(c.max_size() <= max_dist);
assert(c.max_size() <= alloc_max_size(c.get_allocator()));
}
#endif
}

View File

@@ -13,23 +13,38 @@
// size_type max_size() const;
#include <set>
#include <cassert>
#include <limits>
#include <set>
#include <type_traits>
#include "min_allocator.h"
#include "test_allocator.h"
#include "test_macros.h"
int main()
{
{
typedef std::set<int> M;
M m;
assert(m.max_size() != 0);
typedef limited_allocator<int, 10> A;
typedef std::set<int, std::less<int>, A> C;
C c;
assert(c.max_size() <= 10);
LIBCPP_ASSERT(c.max_size() == 10);
}
#if TEST_STD_VER >= 11
{
typedef std::set<int, std::less<int>, min_allocator<int>> M;
M m;
assert(m.max_size() != 0);
typedef limited_allocator<int, (size_t)-1> A;
typedef std::set<int, std::less<int>, A> C;
const C::difference_type max_dist =
std::numeric_limits<C::difference_type>::max();
C c;
assert(c.max_size() <= max_dist);
LIBCPP_ASSERT(c.max_size() == max_dist);
}
{
typedef std::set<char> C;
const C::difference_type max_dist =
std::numeric_limits<C::difference_type>::max();
C c;
assert(c.max_size() <= max_dist);
assert(c.max_size() <= alloc_max_size(c.get_allocator()));
}
#endif
}

View File

@@ -0,0 +1,47 @@
//===----------------------------------------------------------------------===//
//
// 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>
// size_type max_size() const;
#include <cassert>
#include <deque>
#include <limits>
#include <type_traits>
#include "test_allocator.h"
#include "test_macros.h"
int main() {
{
typedef limited_allocator<int, 10> A;
typedef std::deque<int, A> C;
C c;
assert(c.max_size() <= 10);
LIBCPP_ASSERT(c.max_size() == 10);
}
{
typedef limited_allocator<int, (size_t)-1> A;
typedef std::deque<int, A> C;
const C::difference_type max_dist =
std::numeric_limits<C::difference_type>::max();
C c;
assert(c.max_size() <= max_dist);
LIBCPP_ASSERT(c.max_size() == max_dist);
}
{
typedef std::deque<char> C;
const C::difference_type max_dist =
std::numeric_limits<C::difference_type>::max();
C c;
assert(c.max_size() <= max_dist);
assert(c.max_size() <= alloc_max_size(c.get_allocator()));
}
}

View File

@@ -11,25 +11,38 @@
// size_type max_size() const;
#include <forward_list>
#include <cassert>
#include <forward_list>
#include <limits>
#include <type_traits>
#include "min_allocator.h"
#include "test_allocator.h"
#include "test_macros.h"
int main()
{
{
typedef int T;
typedef std::forward_list<T> C;
C c;
assert(c.max_size() > 0);
typedef limited_allocator<int, 10> A;
typedef std::forward_list<int, A> C;
C c;
assert(c.max_size() <= 10);
LIBCPP_ASSERT(c.max_size() == 10);
}
#if TEST_STD_VER >= 11
{
typedef int T;
typedef std::forward_list<T, min_allocator<T>> C;
C c;
assert(c.max_size() > 0);
typedef limited_allocator<int, (size_t)-1> A;
typedef std::forward_list<int, A> C;
const C::difference_type max_dist =
std::numeric_limits<C::difference_type>::max();
C c;
assert(c.max_size() <= max_dist);
LIBCPP_ASSERT(c.max_size() == max_dist);
}
{
typedef std::forward_list<char> C;
const C::difference_type max_dist =
std::numeric_limits<C::difference_type>::max();
C c;
assert(c.max_size() <= max_dist);
assert(c.max_size() <= alloc_max_size(c.get_allocator()));
}
#endif
}

View File

@@ -0,0 +1,47 @@
//===----------------------------------------------------------------------===//
//
// 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.
//
//===----------------------------------------------------------------------===//
// <list>
// size_type max_size() const noexcept
#include <cassert>
#include <limits>
#include <list>
#include <type_traits>
#include "test_allocator.h"
#include "test_macros.h"
int main() {
{
typedef limited_allocator<int, 10> A;
typedef std::list<int, A> C;
C c;
assert(c.max_size() <= 10);
LIBCPP_ASSERT(c.max_size() == 10);
}
{
typedef limited_allocator<int, (size_t)-1> A;
typedef std::list<int, A> C;
const C::difference_type max_dist =
std::numeric_limits<C::difference_type>::max();
C c;
assert(c.max_size() <= max_dist);
LIBCPP_ASSERT(c.max_size() == max_dist);
}
{
typedef std::list<char> C;
const C::difference_type max_dist =
std::numeric_limits<C::difference_type>::max();
C c;
assert(c.max_size() <= max_dist);
assert(c.max_size() <= alloc_max_size(c.get_allocator()));
}
}

View File

@@ -0,0 +1,48 @@
//===----------------------------------------------------------------------===//
//
// 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.
//
//===----------------------------------------------------------------------===//
// <vector>
// size_type max_size() const;
#include <cassert>
#include <limits>
#include <type_traits>
#include <vector>
#include "test_allocator.h"
#include "test_macros.h"
int main() {
{
typedef limited_allocator<int, 10> A;
typedef std::vector<int, A> C;
C c;
assert(c.max_size() <= 10);
LIBCPP_ASSERT(c.max_size() == 10);
}
{
typedef limited_allocator<int, (size_t)-1> A;
typedef std::vector<int, A> C;
const C::difference_type max_dist =
std::numeric_limits<C::difference_type>::max();
C c;
assert(c.max_size() <= max_dist);
LIBCPP_ASSERT(c.max_size() == max_dist);
}
{
typedef std::vector<char> C;
const C::difference_type max_dist =
std::numeric_limits<C::difference_type>::max();
C c;
assert(c.max_size() <= max_dist);
assert(c.max_size() <= alloc_max_size(c.get_allocator()));
}
}

View File

@@ -9,28 +9,45 @@
// <unordered_map>
// template <class Key, class T, class Hash = hash<Key>, class Pred = equal_to<Key>,
// class Alloc = allocator<pair<const Key, T>>>
// class unordered_map
// size_type max_size() const;
#include <unordered_map>
#include <cassert>
#include <limits>
#include <type_traits>
#include <unordered_map>
#include "min_allocator.h"
#include "test_allocator.h"
#include "test_macros.h"
int main()
{
{
std::unordered_map<int, int> u;
assert(u.max_size() > 0);
typedef std::pair<const int, int> KV;
{
typedef limited_allocator<KV, 10> A;
typedef std::unordered_map<int, int, std::hash<int>, std::equal_to<int>, A>
C;
C c;
assert(c.max_size() <= 10);
LIBCPP_ASSERT(c.max_size() == 10);
}
{
typedef limited_allocator<KV, (size_t)-1> A;
typedef std::unordered_map<int, int, std::hash<int>, std::equal_to<int>, A>
C;
const C::difference_type max_dist =
std::numeric_limits<C::difference_type>::max();
C c;
assert(c.max_size() <= max_dist);
LIBCPP_ASSERT(c.max_size() == max_dist);
}
#if TEST_STD_VER >= 11
{
std::unordered_map<int, int, std::hash<int>, std::equal_to<int>,
min_allocator<std::pair<const int, int>>> u;
assert(u.max_size() > 0);
typedef std::unordered_map<char, int> C;
const C::difference_type max_dist =
std::numeric_limits<C::difference_type>::max();
C c;
assert(c.max_size() <= max_dist);
assert(c.max_size() <= alloc_max_size(c.get_allocator()));
}
#endif
}

View File

@@ -9,28 +9,47 @@
// <unordered_map>
// template <class Key, class T, class Hash = hash<Key>, class Pred = equal_to<Key>,
// class Alloc = allocator<pair<const Key, T>>>
// class unordered_multimap
// size_type max_size() const;
#include <unordered_map>
#include <cassert>
#include <limits>
#include <type_traits>
#include <unordered_map>
#include "min_allocator.h"
#include "test_allocator.h"
#include "test_macros.h"
int main()
{
{
std::unordered_multimap<int, int> u;
assert(u.max_size() > 0);
typedef std::pair<const int, int> KV;
{
typedef limited_allocator<KV, 10> A;
typedef std::unordered_multimap<int, int, std::hash<int>,
std::equal_to<int>, A>
C;
C c;
assert(c.max_size() <= 10);
LIBCPP_ASSERT(c.max_size() == 10);
}
{
typedef limited_allocator<KV, (size_t)-1> A;
typedef std::unordered_multimap<int, int, std::hash<int>,
std::equal_to<int>, A>
C;
const C::difference_type max_dist =
std::numeric_limits<C::difference_type>::max();
C c;
assert(c.max_size() <= max_dist);
LIBCPP_ASSERT(c.max_size() == max_dist);
}
#if TEST_STD_VER >= 11
{
std::unordered_multimap<int, int, std::hash<int>, std::equal_to<int>,
min_allocator<std::pair<const int, int>>> u;
assert(u.max_size() > 0);
typedef std::unordered_multimap<char, int> C;
const C::difference_type max_dist =
std::numeric_limits<C::difference_type>::max();
C c;
assert(c.max_size() <= max_dist);
assert(c.max_size() <= alloc_max_size(c.get_allocator()));
}
#endif
}

View File

@@ -9,28 +9,46 @@
// <unordered_set>
// template <class Value, class Hash = hash<Value>, class Pred = equal_to<Value>,
// class Alloc = allocator<Value>>
// class unordered_multiset
// size_type max_size() const;
#include <unordered_set>
#include <cassert>
#include <limits>
#include <type_traits>
#include <unordered_set>
#include "min_allocator.h"
#include "test_allocator.h"
#include "test_macros.h"
int main()
{
{
std::unordered_multiset<int> u;
assert(u.max_size() > 0);
typedef limited_allocator<int, 10> A;
typedef std::unordered_multiset<int, std::hash<int>, std::equal_to<int>,
A>
C;
C c;
assert(c.max_size() <= 10);
LIBCPP_ASSERT(c.max_size() == 10);
}
#if TEST_STD_VER >= 11
{
std::unordered_multiset<int, std::hash<int>,
std::equal_to<int>, min_allocator<int>> u;
assert(u.max_size() > 0);
typedef limited_allocator<int, (size_t)-1> A;
typedef std::unordered_multiset<int, std::hash<int>, std::equal_to<int>,
A>
C;
const C::difference_type max_dist =
std::numeric_limits<C::difference_type>::max();
C c;
assert(c.max_size() <= max_dist);
LIBCPP_ASSERT(c.max_size() == max_dist);
}
{
typedef std::unordered_multiset<char> C;
const C::difference_type max_dist =
std::numeric_limits<C::difference_type>::max();
C c;
assert(c.max_size() <= max_dist);
assert(c.max_size() <= alloc_max_size(c.get_allocator()));
}
#endif
}

View File

@@ -9,28 +9,42 @@
// <unordered_set>
// template <class Value, class Hash = hash<Value>, class Pred = equal_to<Value>,
// class Alloc = allocator<Value>>
// class unordered_set
// size_type max_size() const;
#include <unordered_set>
#include <cassert>
#include <limits>
#include <type_traits>
#include <unordered_set>
#include "min_allocator.h"
#include "test_allocator.h"
#include "test_macros.h"
int main()
{
{
std::unordered_set<int> u;
assert(u.max_size() > 0);
typedef limited_allocator<int, 10> A;
typedef std::unordered_set<int, std::hash<int>, std::equal_to<int>, A> C;
C c;
assert(c.max_size() <= 10);
LIBCPP_ASSERT(c.max_size() == 10);
}
#if TEST_STD_VER >= 11
{
std::unordered_set<int, std::hash<int>,
std::equal_to<int>, min_allocator<int>> u;
assert(u.max_size() > 0);
typedef limited_allocator<int, (size_t)-1> A;
typedef std::unordered_set<int, std::hash<int>, std::equal_to<int>, A> C;
const C::difference_type max_dist =
std::numeric_limits<C::difference_type>::max();
C c;
assert(c.max_size() <= max_dist);
LIBCPP_ASSERT(c.max_size() == max_dist);
}
{
typedef std::unordered_set<char> C;
const C::difference_type max_dist =
std::numeric_limits<C::difference_type>::max();
C c;
assert(c.max_size() <= max_dist);
assert(c.max_size() <= alloc_max_size(c.get_allocator()));
}
#endif
}

View File

@@ -20,6 +20,12 @@
#include "test_macros.h"
template <class Alloc>
inline size_t alloc_max_size(Alloc const &a) {
typedef std::allocator_traits<Alloc> AT;
return AT::max_size(a);
}
class test_alloc_base
{
protected: