OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move allocator in std::string and RB tree move constructors 

PR libstdc++/71964
	* include/bits/basic_string.h [_GLIBCXX_USE_CXX11_ABI]
	(basic_string::_Alloc_hider(pointer, _Alloc&&)): Add constructor.
	* include/bits/stl_tree.h (_Rb_tree(_Rb_tree&&)): Move allocator.
	* testsuite/21_strings/basic_string/allocator/71964.cc: New test.
	* testsuite/23_containers/set/allocator/71964.cc: New test.

From-SVN: r238647
This commit is contained in:
Jonathan Wakely 2016-07-22 16:03:11 +01:00 committed by Jonathan Wakely
parent 58b3986e34
commit 8cab3d18f0
5 changed files with 162 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libstdc++-v3/ChangeLog
View File

@ -1,5 +1,12 @@
2016-07-22 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/71964
* include/bits/basic_string.h [_GLIBCXX_USE_CXX11_ABI]
(basic_string::_Alloc_hider(pointer, _Alloc&&)): Add constructor.
* include/bits/stl_tree.h (_Rb_tree(_Rb_tree&&)): Move allocator.
* testsuite/21_strings/basic_string/allocator/71964.cc: New test.
* testsuite/23_containers/set/allocator/71964.cc: New test.
* testsuite/lib/libstdc++.exp (check_v3_target_namedlocale): Use
delete[] instead of delete.

8
libstdc++-v3/include/bits/basic_string.h
View File

@ -106,8 +106,16 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11
// Use empty-base optimization: http://www.cantrip.org/emptyopt.html
struct _Alloc_hider : allocator_type // TODO check __is_final
{
#if __cplusplus < 201103L
_Alloc_hider(pointer __dat, const _Alloc& __a = _Alloc())
: allocator_type(__a), _M_p(__dat) { }
#else
_Alloc_hider(pointer __dat, const _Alloc& __a)
: allocator_type(__a), _M_p(__dat) { }
_Alloc_hider(pointer __dat, _Alloc&& __a = _Alloc())
: allocator_type(std::move(__a)), _M_p(__dat) { }
#endif
pointer _M_p; // The actual data.
};

3
libstdc++-v3/include/bits/stl_tree.h
View File

@ -851,7 +851,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
_Rb_tree(_Rb_tree&& __x)
: _M_impl(__x._M_impl._M_key_compare, __x._M_get_Node_allocator())
: _M_impl(__x._M_impl._M_key_compare,
std::move(__x._M_get_Node_allocator()))
{
if (__x._M_root() != 0)
_M_move_data(__x, std::true_type());

74
libstdc++-v3/testsuite/21_strings/basic_string/allocator/71964.cc Normal file
View File

@ -0,0 +1,74 @@
// Copyright (C) 2016 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
// terms of the GNU General Public License as published by the
// Free Software Foundation; either version 3, or (at your option)
// any later version.
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License along
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
// { dg-options "-std=gnu++11" }
#include <string>
#include <testsuite_hooks.h>
template<typename T>
struct mv_allocator
{
using value_type = T;
using size_type = unsigned;
mv_allocator()
: moved_to(false), moved_from(false) { }
template<typename U>
mv_allocator(const mv_allocator<U> & a)
: moved_to(a.moved_to), moved_from(a.moved_from) { }
mv_allocator(const mv_allocator &) = default;
mv_allocator(mv_allocator && a) noexcept : moved_to(true)
{
a.moved_from = true;
}
T* allocate(unsigned n) { return std::allocator<T>{}.allcoate(n); }
void deallocate(T* p, unsigned n) { std::allocator<T>{}.deallocate(p, n); }
bool moved_to;
bool moved_from;
};
template<typename T, typename U>
bool
operator==(const mv_allocator<T>&, const mv_allocator<U>&) { return true; }
template<typename T, typename U>
bool
operator!=(const mv_allocator<T>&, const mv_allocator<U>&) { return false; }
void
test01()
{
// COW strings don't support C++11 allocators
#if _GLIBCXX_USE_CXX11_ABI
std::basic_string<char, std::char_traits<char>, mv_allocator<char>> s;
auto t = std::move(s);
VERIFY( s.get_allocator().moved_from );
VERIFY( t.get_allocator().moved_to );
#endif
}
int
main()
{
test01();
}

71
libstdc++-v3/testsuite/23_containers/set/allocator/71964.cc Normal file
View File

@ -0,0 +1,71 @@
// Copyright (C) 2016 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
// terms of the GNU General Public License as published by the
// Free Software Foundation; either version 3, or (at your option)
// any later version.
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License along
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
// { dg-options "-std=gnu++11" }
#include <set>
#include <testsuite_hooks.h>
template<typename T>
struct mv_allocator
{
using value_type = T;
using size_type = unsigned;
mv_allocator()
: moved_to(false), moved_from(false) { }
template<typename U>
mv_allocator(const mv_allocator<U> & a)
: moved_to(a.moved_to), moved_from(a.moved_from) { }
mv_allocator(const mv_allocator &) = default;
mv_allocator(mv_allocator && a) noexcept : moved_to(true)
{
a.moved_from = true;
}
T* allocate(unsigned n) { return std::allocator<T>{}.allcoate(n); }
void deallocate(T* p, unsigned n) { std::allocator<T>{}.deallocate(p, n); }
bool moved_to;
bool moved_from;
};
template<typename T, typename U>
bool
operator==(const mv_allocator<T>&, const mv_allocator<U>&) { return true; }
template<typename T, typename U>
bool
operator!=(const mv_allocator<T>&, const mv_allocator<U>&) { return false; }
void
test01()
{
std::set<int, std::less<int>, mv_allocator<int>> s;
auto t = std::move(s);
VERIFY( s.get_allocator().moved_from );
VERIFY( t.get_allocator().moved_to );
}
int
main()
{
test01();
}