Patchwork [v3] C++11 allocator reqs for vector in debug & profile mode

login
register
mail settings
Submitter Jonathan Wakely
Date Nov. 9, 2011, 9:14 p.m.
Message ID <CAH6eHdRtYWGakjwW_PWnCL6RTREg=5=9N6gA6GJ_6U_N4zsjJA@mail.gmail.com>
Download mbox | patch
Permalink /patch/124702/
State New
Headers show

Comments

Jonathan Wakely - Nov. 9, 2011, 9:14 p.m.
On 9 November 2011 10:19, Paolo Carlini wrote:
> Hi
>>
>> I checked, and it's currently broken :)
>>
>> We do the wrong thing for allocators with
>> propagate_on_container_swap==true.
>>
>> I think the fix might be as simple as constructing the new container
>> with a copy of the old one's allocator, so even if it gets swapped
>> it's equal.

Like so:

        * include/bits/allocator.h (__shrink_to_fit_aux::_S_do_it): Create
        the new object with the same allocator.
        * testsuite/23_containers/vector/capacity/shrink_to_fit2.cc: New.

Tested x86_64-linux, committed to trunk.

Thanks for reminding me about it.


>> I'll deal with it asap.
>
> Thanks a lot!
>
> Paolo.
>

Patch

Index: include/bits/allocator.h
===================================================================
--- include/bits/allocator.h	(revision 181234)
+++ include/bits/allocator.h	(revision 181235)
@@ -198,7 +198,8 @@  _GLIBCXX_BEGIN_NAMESPACE_VERSION
 	__try
 	  {
 	    _Tp(__make_move_if_noexcept_iterator(__c.begin()),
-		__make_move_if_noexcept_iterator(__c.end())).swap(__c);
+		__make_move_if_noexcept_iterator(__c.end()),
+		__c.get_allocator()).swap(__c);
 	    return true;
 	  }
 	__catch(...)
Index: testsuite/23_containers/vector/capacity/shrink_to_fit2.cc
===================================================================
--- testsuite/23_containers/vector/capacity/shrink_to_fit2.cc	(revision 0)
+++ testsuite/23_containers/vector/capacity/shrink_to_fit2.cc	(revision 181235)
@@ -0,0 +1,61 @@ 
+// { dg-options "-std=gnu++0x" }
+
+// Copyright (C) 2011 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 Pred 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/>.
+
+#include <vector>
+#include <testsuite_hooks.h>
+#include <testsuite_allocator.h>
+
+using __gnu_test::propagating_allocator;
+
+void test01()
+{
+  bool test __attribute__((unused)) = true;
+
+  typedef propagating_allocator<int, true> alloc_type;
+  alloc_type alloc(5);
+
+  std::vector<int, alloc_type> v(10u, 1, alloc);
+  v.reserve(100);
+  VERIFY( v.size() < v.capacity() );
+  v.shrink_to_fit();
+  VERIFY( v.size() == v.capacity() );
+  VERIFY( v.get_allocator().get_personality() == alloc.get_personality() );
+}
+
+void test02()
+{
+  bool test __attribute__((unused)) = true;
+
+  typedef propagating_allocator<int, false> alloc_type;
+  alloc_type alloc(5);
+
+  std::vector<int, alloc_type> v(10u, 1, alloc);
+  v.reserve(100);
+  VERIFY( v.size() < v.capacity() );
+  v.shrink_to_fit();
+  VERIFY( v.size() == v.capacity() );
+  VERIFY( v.get_allocator().get_personality() == alloc.get_personality() );
+}
+
+int main()
+{
+  test01();
+  test02();
+  return 0;
+}