git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

re PR libstdc++/59548 (Abort after copying std::unordered_map in debug mode) 

PR libstdc++/59548
	* include/debug/safe_base.h (_Safe_sequence_base): Define copy
	constructor to prevent it being implicitly defined as deleted, but
	do not copy anything.
	* include/debug/safe_unordered_base.h (_Safe_unordered_container_base):
	Define copy and move constructors similar to _Safe_sequence_base's.
	* testsuite/23_containers/unordered_map/59548.cc: New.

From-SVN: r207059
This commit is contained in:
Jonathan Wakely 2014-01-24 20:08:20 +00:00 committed by Jonathan Wakely
parent 233aedf4c3
commit f74912779b
4 changed files with 58 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,13 @@
2014-01-24 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/59548
* include/debug/safe_base.h (_Safe_sequence_base): Define copy
constructor to prevent it being implicitly defined as deleted, but
do not copy anything.
* include/debug/safe_unordered_base.h (_Safe_unordered_container_base):
Define copy and move constructors similar to _Safe_sequence_base's.
* testsuite/23_containers/unordered_map/59548.cc: New.
2014-01-23 Bernhard Reutner-Fischer <aldot@gcc.gnu.org> 2014-01-23 Bernhard Reutner-Fischer <aldot@gcc.gnu.org>
Steve Ellcey <sellcey@mips.com> Steve Ellcey <sellcey@mips.com>

3
libstdc++-v3/include/debug/safe_base.h
View File

@ -193,6 +193,9 @@ namespace __gnu_debug
{ } { }
#if __cplusplus >= 201103L #if __cplusplus >= 201103L
_Safe_sequence_base(const _Safe_sequence_base&) noexcept
: _Safe_sequence_base() { }
_Safe_sequence_base(_Safe_sequence_base&& __x) noexcept _Safe_sequence_base(_Safe_sequence_base&& __x) noexcept
: _Safe_sequence_base() : _Safe_sequence_base()
{ _M_swap(__x); } { _M_swap(__x); }

12
libstdc++-v3/include/debug/safe_unordered_base.h
View File

@ -133,9 +133,19 @@ namespace __gnu_debug
protected: protected:
// Initialize with a version number of 1 and no iterators // Initialize with a version number of 1 and no iterators
_Safe_unordered_container_base() _Safe_unordered_container_base()
: _M_local_iterators(0), _M_const_local_iterators(0) : _M_local_iterators(nullptr), _M_const_local_iterators(nullptr)
{ } { }
// Initialize with a version number of 1 and no iterators
_Safe_unordered_container_base(const _Safe_unordered_container_base&)
noexcept
: _Safe_unordered_container_base() { }
_Safe_unordered_container_base(_Safe_unordered_container_base&& __x)
noexcept
: _Safe_unordered_container_base()
{ this->_M_swap(__x); }
/** Notify all iterators that reference this container that the /** Notify all iterators that reference this container that the
container is being destroyed. */ container is being destroyed. */
~_Safe_unordered_container_base() ~_Safe_unordered_container_base()

34
libstdc++-v3/testsuite/23_containers/unordered_map/59548.cc Normal file
View File

@ -0,0 +1,34 @@
// { dg-options "-std=gnu++11" }
// { dg-do compile }
// { dg-require-debug-mode "" }
// 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/>.
// libstdc++/59548
#include <unordered_map>
int main()
{
std::unordered_map<int,int> foo{ {0,1} };
auto i = foo.begin();
{
auto bar = foo;
}
return i->first;
}