diff mbox

libstdc++ testsuite make targets check-parallel and check-performance don't work anymore

Message ID 20141104034118.GG3961@redhat.com
State New
Headers show

Commit Message

Jonathan Wakely Nov. 4, 2014, 3:41 a.m. UTC 
On 03/11/14 22:07 +0000, Jonathan Wakely wrote:
>On 3 November 2014 17:51, Paolo Carlini <paolo.carlini@oracle.com> wrote:
>> .. other than the above issue, I see a segmentation fault for:
>>
>>     performance/ext/pb_ds/multimap_text_insert_mem_large.cc
>>
>> and a compile error for:
>>
>>     performance/ext/pb_ds/priority_queue_text_pop_mem.cc
>>
>> which boils down to a an error at include/bits/stl_deque.h:519 (likely pd_ds
>> is misusing std::deque). Jon, can you double check the latter?
>
>I think it's a bug I introduced to std::deque -- I'm assuming that
>MoveConstructible allocators are also MoveAssignable, which is not a
>valid assumption. I'll fix it.

Fixed by this patch, committed to trunk.
diff mbox

Patch

commit f84f372dceab9cd9401caf326f942557e8ccfcac
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Tue Nov 4 03:16:55 2014 +0000

    Do not assume allocator is assignable.
    
    	* include/bits/stl_deque.h (_Deque_base(_Deque_base&&)): Copy
    	allocator instead of moving.
    	* testsuite/23_containers/deque/allocator/move-2.cc: New.

diff --git a/libstdc++-v3/include/bits/stl_deque.h b/libstdc++-v3/include/bits/stl_deque.h
index acb7715..d50d3c90 100644
--- a/libstdc++-v3/include/bits/stl_deque.h
+++ b/libstdc++-v3/include/bits/stl_deque.h
@@ -503,23 +503,11 @@  _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
 
 #if __cplusplus >= 201103L
       _Deque_base(_Deque_base&& __x)
-      : _M_impl(std::move(__x._M_get_Tp_allocator()))
+      : _M_impl(__x._M_get_Tp_allocator())
       {
+	_M_initialize_map(0);
 	if (__x._M_impl._M_map)
-	  {
-	    this->_M_impl._M_swap_data(__x._M_impl);
-	    __try
-	      {
-		// Re-initialize __x using its moved-from allocator.
-		__x._M_initialize_map(0);
-	      }
-	    __catch (...)
-	      {
-		this->_M_impl._M_swap_data(__x._M_impl);
-		__x._M_get_Tp_allocator() = std::move(_M_get_Tp_allocator());
-		__throw_exception_again;
-	      }
-	  }
+	  this->_M_impl._M_swap_data(__x._M_impl);
       }
 
       _Deque_base(_Deque_base&& __x, const allocator_type& __a, size_type __n)
diff --git a/libstdc++-v3/testsuite/23_containers/deque/allocator/move-2.cc b/libstdc++-v3/testsuite/23_containers/deque/allocator/move-2.cc
new file mode 100644
index 0000000..3932676
--- /dev/null
+++ b/libstdc++-v3/testsuite/23_containers/deque/allocator/move-2.cc
@@ -0,0 +1,53 @@ 
+// Copyright (C) 2014 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" }
+// { dg-do compile }
+
+#include <deque>
+
+template<typename T>
+struct Alloc
+{
+  using value_type = T;
+
+  Alloc() = default;
+
+  template<typename U>
+    Alloc(const Alloc<U>&) { }
+
+  Alloc& operator=(const Alloc&) = delete;
+
+  T* allocate(std::size_t n)
+  { return std::allocator<T>{}.allocate(n); }
+
+  void deallocate(T* p, std::size_t n)
+  { std::allocator<T>{}.deallocate(p, n); }
+};
+
+template<typename T>
+bool operator==(const Alloc<T>&, const Alloc<T>&) { return true; }
+
+template<typename T>
+bool operator!=(const Alloc<T>&, const Alloc<T>&) { return false; }
+
+void
+test01()
+{
+  std::deque<int, Alloc<int>> d;
+  auto d2 = std::move(d);
+}