Patchwork [v3] libstdc++/57010

login
register
mail settings
Submitter Paolo Carlini
Date April 22, 2013, 10:08 a.m.
Message ID <51750C2F.1060908@oracle.com>
Download mbox | patch
Permalink /patch/238396/
State New
Headers show

Comments

Paolo Carlini - April 22, 2013, 10:08 a.m.
Hi,

a straightforward issue, tested x86_64-linux, committed mainline and 
4_8-branch.

Thanks,
Paolo.

////////////////////////
2013-04-22  Paolo Carlini  <paolo.carlini@oracle.com>

	PR libstdc++/57010
	* include/bits/stl_heap.h (pop_heap): Avoid self move-assignment.
	* testsuite/25_algorithms/pop_heap/57010.cc: New.

Patch

Index: include/bits/stl_heap.h
===================================================================
--- include/bits/stl_heap.h	(revision 198124)
+++ include/bits/stl_heap.h	(working copy)
@@ -291,8 +291,11 @@ 
       __glibcxx_requires_valid_range(__first, __last);
       __glibcxx_requires_heap(__first, __last);
 
-      --__last;
-      std::__pop_heap(__first, __last, __last);
+      if (__last - __first > 1)
+	{
+	  --__last;
+	  std::__pop_heap(__first, __last, __last);
+	}
     }
 
   template<typename _RandomAccessIterator, typename _Distance,
@@ -363,8 +366,11 @@ 
       __glibcxx_requires_non_empty_range(__first, __last);
       __glibcxx_requires_heap_pred(__first, __last, __comp);
 
-      --__last;
-      std::__pop_heap(__first, __last, __last, __comp);
+      if (__last - __first > 1)
+	{
+	  --__last;
+	  std::__pop_heap(__first, __last, __last, __comp);
+	}
     }
 
   /**
Index: testsuite/25_algorithms/pop_heap/57010.cc
===================================================================
--- testsuite/25_algorithms/pop_heap/57010.cc	(revision 0)
+++ testsuite/25_algorithms/pop_heap/57010.cc	(working copy)
@@ -0,0 +1,55 @@ 
+// 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/>.
+
+// { dg-options "-std=gnu++11" }
+
+#include <algorithm>
+#include <functional>
+#include <testsuite_hooks.h>
+#include <testsuite_iterators.h>
+#include <testsuite_rvalref.h>
+
+using __gnu_test::test_container;
+using __gnu_test::random_access_iterator_wrapper;
+using __gnu_test::rvalstruct;
+
+typedef test_container<rvalstruct, random_access_iterator_wrapper> container;
+
+void test01()
+{
+  {
+    rvalstruct makeheap[1];
+    container makecon(makeheap, makeheap + 1);
+
+    std::push_heap(makecon.begin(), makecon.end());
+    std::pop_heap(makecon.begin(), makecon.end());
+  }
+
+  {
+    rvalstruct makeheap[1];
+    container makecon(makeheap, makeheap + 1);
+
+    std::push_heap(makecon.begin(), makecon.end(), std::less<rvalstruct>());
+    std::pop_heap(makecon.begin(), makecon.end(), std::less<rvalstruct>());
+  }
+}
+
+int main()
+{
+  test01();
+  return 0;
+}