Hi, fixed mainline and 4_8-branch. Tested x86_64-linux.
Thanks, Paolo. ////////////////////////
2013-09-13 Paolo Carlini <paolo.carl...@oracle.com> PR libstdc++/58415 * include/ext/sso_string_base.h (__sso_string_base<>:: __sso_string_base(__sso_string_base&&)): Fix thinkos about _M_length vs _M_set_length. * testsuite/ext/vstring/cons/58415-1.cc: New. * testsuite/ext/vstring/cons/58415-2.cc: Likewise.
Index: include/ext/sso_string_base.h =================================================================== --- include/ext/sso_string_base.h (revision 202561) +++ include/ext/sso_string_base.h (working copy) @@ -361,9 +361,9 @@ _M_capacity(__rcs._M_allocated_capacity); } - _M_length(__rcs._M_length()); - __rcs._M_length(0); + _M_set_length(__rcs._M_length()); __rcs._M_data(__rcs._M_local_data); + __rcs._M_set_length(0); } #endif Index: testsuite/ext/vstring/cons/58415-1.cc =================================================================== --- testsuite/ext/vstring/cons/58415-1.cc (revision 0) +++ testsuite/ext/vstring/cons/58415-1.cc (working copy) @@ -0,0 +1,41 @@ +// { dg-options "-std=gnu++11" } +// { dg-require-string-conversions "" } + +// 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/>. + +#include <ext/vstring.h> +#include <testsuite_hooks.h> + +typedef __gnu_cxx::__versa_string<char> string; + +void test01() +{ + bool test __attribute__((unused)) = true; + + string s1("string"); + string s2(""); + std::swap(s1, s2); + + VERIFY( s1.c_str()[0] == '\0' ); +} + +int main() +{ + test01(); + return 0; +} Index: testsuite/ext/vstring/cons/58415-2.cc =================================================================== --- testsuite/ext/vstring/cons/58415-2.cc (revision 0) +++ testsuite/ext/vstring/cons/58415-2.cc (working copy) @@ -0,0 +1,38 @@ +// { dg-options "-std=gnu++11" } +// { dg-require-string-conversions "" } + +// 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/>. + +#include <ext/vstring.h> +#include <testsuite_hooks.h> + +typedef __gnu_cxx::__versa_string<char> string; + +void test01() +{ + string s1; + string s2 = std::move(s1); + + VERIFY( s2.c_str()[0] == '\0' ); +} + +int main() +{ + test01(); + return 0; +}