FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR libstdc++/46830 (s.swap(s) triggers overlapped memcpy() for versa_string)

Browse source 
2010-12-06  Paul Pluzhnikov  <ppluzhnikov@google.com>

	PR libstdc++/46830
	* include/ext/sso_string_base.h (__sso_string_base<>::_M_swap):
	Early return when this == &__rcs.

From-SVN: r167528
This commit is contained in:
Paul Pluzhnikov 2010-12-06 18:43:16 -08:00 • committed by Paolo Carlini
parent 1b6d012b50
commit a180e98542
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libstdc++-v3/ChangeLog
View file

@ -1,3 +1,9 @@
2010-12-06 Paul Pluzhnikov <ppluzhnikov@google.com>
PR libstdc++/46830
* include/ext/sso_string_base.h (__sso_string_base<>::_M_swap):
Early return when this == &__rcs.
2010-12-06 Paolo Carlini <paolo.carlini@oracle.com> 2010-12-06 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/shared_ptr.h (shared_ptr<>::shared_ptr(_Tp1*, _Deleter, * include/bits/shared_ptr.h (shared_ptr<>::shared_ptr(_Tp1*, _Deleter,

6
libstdc++-v3/include/ext/sso_string_base.h
View file

@ -1,6 +1,7 @@
// Short-string-optimized versatile string base -*- C++ -*- // Short-string-optimized versatile string base -*- C++ -*-
// Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. // Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010
// Free Software Foundation, Inc.
// //
// This file is part of the GNU ISO C++ Library. This library is free // 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 // software; you can redistribute it and/or modify it under the
@ -232,6 +233,9 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
__sso_string_base<_CharT, _Traits, _Alloc>:: __sso_string_base<_CharT, _Traits, _Alloc>::
_M_swap(__sso_string_base& __rcs) _M_swap(__sso_string_base& __rcs)
{ {
if (this == &__rcs)
return;
// _GLIBCXX_RESOLVE_LIB_DEFECTS // _GLIBCXX_RESOLVE_LIB_DEFECTS
// 431. Swapping containers with unequal allocators. // 431. Swapping containers with unequal allocators.
std::__alloc_swap<_CharT_alloc_type>::_S_do_it(_M_get_allocator(), std::__alloc_swap<_CharT_alloc_type>::_S_do_it(_M_get_allocator(),