OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR libstdc++/24064 (tr1::unordered_map seems to seg-fault when caching hash values) 

2005-09-30  Paolo Carlini  <pcarlini@suse.de>

	PR libstdc++/24064
	* include/tr1/hashtable (hash_code_base<>::store_code): Add.
	(hashtable<>::insert(const value_type&)): Use it.
	* testsuite/tr1/6_containers/unordered/hashtable/24064.cc: New.

From-SVN: r104823
This commit is contained in:
Paolo Carlini 2005-09-30 16:54:54 +00:00 committed by Paolo Carlini
parent 72a7ab824e
commit 18048e65b0
3 changed files with 67 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,10 @@
2005-09-30 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/24064
* include/tr1/hashtable (hash_code_base<>::store_code): Add.
(hashtable<>::insert(const value_type&)): Use it.
* testsuite/tr1/6_containers/unordered/hashtable/24064.cc: New.
2005-09-30 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/23953

14
libstdc++-v3/include/tr1/hashtable
View File

@ -626,6 +626,10 @@ namespace Internal
compare(const Key& k, hash_code_t, hash_node<Value, false>* n) const
{ return m_eq (k, m_extract(n->m_v)); }
void
store_code(hash_node<Value, false>*, hash_code_t) const
{ }
void
copy_code(hash_node<Value, false>*, const hash_node<Value, false>*) const
{ }
@ -698,6 +702,10 @@ namespace Internal
compare(const Key& k, hash_code_t, hash_node<Value, false>* n) const
{ return m_eq (k, m_extract(n->m_v)); }
void
store_code(hash_node<Value, false>*, hash_code_t) const
{ }
void
copy_code(hash_node<Value, false>*, const hash_node<Value, false>*) const
{ }
@ -756,6 +764,10 @@ namespace Internal
compare(const Key& k, hash_code_t c, hash_node<Value, true>* n) const
{ return c == n->hash_code && m_eq(k, m_extract(n->m_v)); }
void
store_code(hash_node<Value, true>* n, hash_code_t c) const
{ n->hash_code = c; }
void
copy_code(hash_node<Value, true>* to,
const hash_node<Value, true>* from) const
@ -1508,6 +1520,7 @@ namespace tr1
}
new_node->m_next = m_buckets[n];
this->store_code(new_node, code);
m_buckets[n] = new_node;
++m_element_count;
return std::make_pair(iterator(new_node, m_buckets + n), true);
@ -1549,6 +1562,7 @@ namespace tr1
new_node->m_next = m_buckets[n];
m_buckets[n] = new_node;
}
this->store_code(new_node, code);
++m_element_count;
return iterator(new_node, m_buckets + n);

46
libstdc++-v3/testsuite/tr1/6_containers/unordered/hashtable/24064.cc Normal file
View File

@ -0,0 +1,46 @@
// Copyright (C) 2005 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 2, 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 COPYING. If not, write to the Free
// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
// USA.
// 6.3 Unordered associative containers
#include <tr1/unordered_map>
#include <testsuite_hooks.h>
// libstdc++/24064
void test01()
{
bool test __attribute__((unused)) = true;
using namespace std;
using namespace tr1;
unordered_map<int, char, hash<int>, equal_to<int>,
allocator<pair<const int, char> >, true> m;
for (int i = 0; i < 1000; ++i)
m[i] = '0' + i % 9;
for (int i = 0; i < 1000; ++i)
VERIFY( ++m.find(i)->second == '1' + i % 9 );
}
int main()
{
test01();
return 0;
}