Patchwork [v3] libstdc++/55979 (+ notes about 55977)

login
register
mail settings
Submitter Paolo Carlini
Date March 18, 2013, 10:02 a.m.
Message ID <5146E62E.7040804@oracle.com>
Download mbox | patch
Permalink /patch/228431/
State New
Headers show

Comments

Paolo Carlini - March 18, 2013, 10:02 a.m.
Hi,

On 03/17/2013 06:45 PM, Jonathan Wakely wrote:
> On 17 March 2013 17:14, Paolo Carlini wrote:
>> I guess we could at least work around the problem by going back to
>> _M_get_Tp_allocator().construct in _M_create_node (or, better, the
>> allocator_traits<>::construct equivalent, per the recent fix for 56613; we
>> would use it on _Tp actually, everywhere) but I don't know if Jon has
>> already something in his tree for this batch of issues regarding our base
>> container class / node constructors, or we want to decouple the issue from
>> 55977, do std::vector and std::deque, which would be trivial even for 4.8.1,
>> or something else. Suggestions?
> For std::list I'm waiting until we have two separate C++03 and C++11
> implementations, then I'll implement allocator support in the C++11
> code only, as it will be much easier. ...
Ok  great. Then, I'm going to apply mainline and 4.8.1 the 
straightforward std::vector and std::deque bits. The PR remains open for 
the rest.

Thanks!
Paolo.

/////////////////////
2013-03-18  Paolo Carlini  <paolo.carlini@oracle.com>

	PR libstdc++/55977 (partial, std::vector and std::deque bits)
	* include/bits/stl_vector.h (_M_range_initialize(_InputIterator,
	_InputIterator, std::input_iterator_tag)): Use emplace_back.
	* include/bits/deque.tcc (_M_range_initialize(_InputIterator,
	_InputIterator, std::input_iterator_tag)): Likewise.
	* testsuite/23_containers/vector/cons/55977.cc: New.
	* testsuite/23_containers/deque/cons/55977.cc: Likewise.
	* testsuite/23_containers/vector/requirements/dr438/assign_neg.cc:
	Adjust dg-error line number.
	* testsuite/23_containers/vector/requirements/dr438/insert_neg.cc:
	Likewise.

Patch

Index: include/bits/deque.tcc
===================================================================
--- include/bits/deque.tcc	(revision 196754)
+++ include/bits/deque.tcc	(working copy)
@@ -381,7 +381,11 @@ 
         __try
           {
             for (; __first != __last; ++__first)
+#if __cplusplus >= 201103L
+	      emplace_back(*__first);
+#else
               push_back(*__first);
+#endif
           }
         __catch(...)
           {
Index: include/bits/stl_vector.h
===================================================================
--- include/bits/stl_vector.h	(revision 196754)
+++ include/bits/stl_vector.h	(working copy)
@@ -1184,7 +1184,11 @@ 
 			    _InputIterator __last, std::input_iterator_tag)
         {
 	  for (; __first != __last; ++__first)
+#if __cplusplus >= 201103L
+	    emplace_back(*__first);
+#else
 	    push_back(*__first);
+#endif
 	}
 
       // Called by the second initialize_dispatch above
Index: testsuite/23_containers/deque/cons/55977.cc
===================================================================
--- testsuite/23_containers/deque/cons/55977.cc	(revision 0)
+++ testsuite/23_containers/deque/cons/55977.cc	(working copy)
@@ -0,0 +1,70 @@ 
+// { dg-do compile }
+// { dg-options "-std=gnu++11" }
+
+// Copyright (C) 2013 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/>.
+
+#include <memory>
+#include <utility>
+#include <deque>
+#include <iterator>
+
+template <class T>
+struct MyAllocator
+{
+  std::allocator<T> base;
+  typedef T         value_type;
+
+  // FIXME: these types shouldn't be required.
+  typedef T*        pointer;
+  typedef const T*  const_pointer;
+  typedef T&        reference;
+  typedef const T&  const_reference;
+  template <typename U>
+    struct rebind
+    { typedef MyAllocator<U> other; };
+
+  MyAllocator() = default;
+  template <class U>
+  MyAllocator(const MyAllocator<U>& other) : base(other.base) {}
+  T* allocate(std::size_t n) { return base.allocate(n); }
+  void deallocate(T* p, std::size_t n) { return base.deallocate(p, n); }
+  template <class U, class... Args>
+  void construct(U* p, Args&&... args)
+  {
+    ::new (static_cast<void*>(p)) U(std::forward<Args>(args)...);
+  }
+};
+
+struct A
+{
+private:
+  friend class MyAllocator<A>;
+  A(int value) : value(value) {}
+  int value;
+public:
+  A() : value() {}
+  int get() const { return value; }
+};
+
+void foo()
+{
+  std::deque<A, MyAllocator<A>> v1;
+  const int i = 1;
+  v1.emplace_back(i); // OK
+  std::deque<A, MyAllocator<A>> v2(std::istream_iterator<int>(), {}); // ERROR
+}
Index: testsuite/23_containers/vector/cons/55977.cc
===================================================================
--- testsuite/23_containers/vector/cons/55977.cc	(revision 0)
+++ testsuite/23_containers/vector/cons/55977.cc	(working copy)
@@ -0,0 +1,60 @@ 
+// { dg-do compile }
+// { dg-options "-std=gnu++11" }
+
+// Copyright (C) 2013 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/>.
+
+#include <memory>
+#include <utility>
+#include <vector>
+#include <iterator>
+
+template <class T>
+struct MyAllocator
+{
+  std::allocator<T> base;
+  typedef T value_type;
+  MyAllocator() = default;
+  template <class U>
+  MyAllocator(const MyAllocator<U>& other) : base(other.base) {}
+  T* allocate(std::size_t n) { return base.allocate(n); }
+  void deallocate(T* p, std::size_t n) { return base.deallocate(p, n); }
+  template <class U, class... Args>
+  void construct(U* p, Args&&... args)
+  {
+    ::new (static_cast<void*>(p)) U(std::forward<Args>(args)...);
+  }
+};
+
+struct A
+{
+private:
+  friend class MyAllocator<A>;
+  A(int value) : value(value) {}
+  int value;
+public:
+  A() : value() {}
+  int get() const { return value; }
+};
+
+void foo()
+{
+  std::vector<A, MyAllocator<A>> v1;
+  const int i = 1;
+  v1.emplace_back(i); // OK
+  std::vector<A, MyAllocator<A>> v2(std::istream_iterator<int>(), {}); // ERROR
+}
Index: testsuite/23_containers/vector/requirements/dr438/assign_neg.cc
===================================================================
--- testsuite/23_containers/vector/requirements/dr438/assign_neg.cc	(revision 196754)
+++ testsuite/23_containers/vector/requirements/dr438/assign_neg.cc	(working copy)
@@ -18,7 +18,7 @@ 
 // <http://www.gnu.org/licenses/>.
 
 // { dg-do compile }
-// { dg-error "no matching" "" { target *-*-* } 1236 }
+// { dg-error "no matching" "" { target *-*-* } 1240 }
 
 #include <vector>
 
Index: testsuite/23_containers/vector/requirements/dr438/insert_neg.cc
===================================================================
--- testsuite/23_containers/vector/requirements/dr438/insert_neg.cc	(revision 196754)
+++ testsuite/23_containers/vector/requirements/dr438/insert_neg.cc	(working copy)
@@ -18,7 +18,7 @@ 
 // <http://www.gnu.org/licenses/>.
 
 // { dg-do compile }
-// { dg-error "no matching" "" { target *-*-* } 1277 }
+// { dg-error "no matching" "" { target *-*-* } 1281 }
 
 #include <vector>