[Bug libstdc++/63456] unordered_map incorrectly frees _M_single_bucket. Patch Included

2014-10-05 Thread François Dumont

Hi

I just committed this trivial bug fix.

Shall I go ahead and apply it to 4.9 branch too ?

2014-10-05  François Dumont  

PR libstdc++/63456
* include/bits/hashtable.h (_M_uses_single_bucket(__bucket_type*)): 
Test

the parameter.
* testsuite/23_containers/unordered_set/63456.cc: New.

François
Index: include/bits/hashtable.h
===
--- include/bits/hashtable.h	(revision 215902)
+++ include/bits/hashtable.h	(working copy)
@@ -326,7 +326,7 @@
 
   bool
   _M_uses_single_bucket(__bucket_type* __bkts) const
-  { return __builtin_expect(_M_buckets == &_M_single_bucket, false); }
+  { return __builtin_expect(__bkts == &_M_single_bucket, false); }
 
   bool
   _M_uses_single_bucket() const
Index: testsuite/23_containers/unordered_set/63456.cc
===
--- testsuite/23_containers/unordered_set/63456.cc	(revision 0)
+++ testsuite/23_containers/unordered_set/63456.cc	(working copy)
@@ -0,0 +1,36 @@
+// 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
+// .
+
+// { dg-options "-std=gnu++11" }
+
+#include 
+
+#include 
+
+void test01()
+{
+  std::unordered_set s1, s2;
+  s2.insert(2);
+
+  s1 = s2;
+}
+
+int main()
+{
+  test01();
+  return 0;
+}


Re: [Bug libstdc++/63456] unordered_map incorrectly frees _M_single_bucket. Patch Included

2014-10-05 Thread Jonathan Wakely
On 5 October 2014 19:50, François Dumont wrote:
> Hi
>
> I just committed this trivial bug fix.
>
> Shall I go ahead and apply it to 4.9 branch too ?

Yes please.


Re: [Bug libstdc++/63456] unordered_map incorrectly frees _M_single_bucket. Patch Included

2014-10-05 Thread Paolo Carlini

Hi,

On 10/05/2014 08:50 PM, François Dumont wrote:

+#include 

Seems redundant.

Thanks!
Paolo.


Re: [Bug libstdc++/63456] unordered_map incorrectly frees _M_single_bucket. Patch Included

2014-10-05 Thread François Dumont

On 05/10/2014 21:37, Paolo Carlini wrote:

Hi,

On 10/05/2014 08:50 PM, François Dumont wrote:

+#include 

Seems redundant.

Thanks!
Paolo.

Yes it is and in fact I had remove it before the real commit, I should 
have update the patch.


François