obtained gcc-4.6.4.tar.bz2 from upstream website;upstream

verified gcc-4.6.4.tar.bz2.sig;
imported gcc-4.6.4 source tree from verified upstream tarball.

downloading a git-generated archive based on the 'upstream' tag
should provide you with a source tree that is binary identical
to the one extracted from the above tarball.

if you have obtained the source via the command 'git clone',
however, do note that line-endings of files in your working
directory might differ from line-endings of the respective
files in the upstream repository.

2 files changed, 157 insertions, 0 deletions

diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputbackc/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputbackc/wchar_t/1.cc
new file mode 100644
index 000000000..e0c91a3b2
--- /dev/null
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputbackc/wchar_t/1.cc
@@ -0,0 +1,115 @@
+// 981208 bkoz test functionality of basic_stringbuf for char_type == wchar_t
+
+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2009, 2010
+// 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 <sstream>
+#include <testsuite_hooks.h>
+
+std::wstring str_01(L"mykonos. . . or what?");
+std::wstring str_02(L"paris, or sainte-maxime?");
+std::wstring str_03;
+std::wstringbuf strb_01(str_01);
+std::wstringbuf strb_02(str_02, std::ios_base::in);
+std::wstringbuf strb_03(str_03, std::ios_base::out);
+
+// test overloaded virtual functions
+void test04() 
+{
+  bool test __attribute__((unused)) = true;
+  std::wstring 		str_tmp, str_tmp2;
+  typedef std::wstringbuf::int_type int_type;
+  typedef std::wstringbuf::traits_type traits_type;
+
+  int_type c1 = strb_01.sbumpc();
+  int_type c2 = strb_02.sbumpc();
+  int_type c3 = strb_01.sbumpc();
+  int_type c4 = strb_02.sbumpc();
+
+  // PUT
+  strb_03.str(str_01); //reset
+  strb_03.str().length();
+  strb_03.str().length();
+  
+  // streamsize sputn(const char_typs* s, streamsize n)
+  // write up to n chars to out_cur from s, returning number assigned
+  // NB *sputn will happily put '\0' into your stream if you give it a chance*
+  str_tmp = strb_03.str();
+  str_tmp.length();
+  strb_03.sputn(L"racadabras", 10);//"abracadabras or what?"
+  strb_03.str().length();
+  strb_03.sputn(L", i wanna reach out and", 10);
+  strb_03.str().length();
+  str_tmp = strb_02.str();
+  strb_02.sputn(L"racadabra", 10);
+
+  // PUTBACK
+
+  // int_type sputbackc(char_type c)
+  // if in_cur not avail || ! traits::eq(c, gptr() [-1]), return pbfail
+  // otherwise decrements in_cur and returns *gptr()
+  strb_01.in_avail();
+  str_tmp = strb_01.str();
+  c1 = strb_01.sgetc(); //"mykonos. . . 'o'r what?"
+  c2 = strb_01.sputbackc(L'z');//"mykonos. . .zor what?"
+  c3 = strb_01.sgetc();
+  str_tmp2 = strb_01.str();
+  VERIFY( c1 != c2 );
+  VERIFY( c3 == c2 );
+  VERIFY( str_tmp2 == std::wstring(L"mzkonos. . . or what?") );
+  VERIFY( str_tmp.size() == str_tmp2.size() );
+  //test for _in_cur == _in_beg
+  strb_01.str(str_tmp);
+  strb_01.in_avail();
+  c1 = strb_01.sgetc(); //"'m'ykonos. . . or what?"
+  c2 = strb_01.sputbackc(L'z');//"mykonos. . . or what?"
+  c3 = strb_01.sgetc();
+  VERIFY( c1 != c2 );
+  VERIFY( c3 != c2 );
+  VERIFY( c1 == c3 );
+  VERIFY( c2 == traits_type::eof() );
+  VERIFY( strb_01.str() == str_tmp );
+  VERIFY( str_tmp.size() == strb_01.str().size() );
+  // test for replacing char with identical one
+  strb_01.str(str_01); //reset
+  strb_01.in_avail();
+  strb_01.sbumpc();
+  strb_01.sbumpc();
+  c1 = strb_01.sgetc(); //"my'k'onos. . . or what?"
+  c2 = strb_01.sputbackc(L'y');//"mykonos. . . or what?"
+  c3 = strb_01.sgetc();
+  VERIFY( c1 != c2 );
+  VERIFY( c3 == c2 );
+  VERIFY( c1 != c3 );
+  VERIFY( strb_01.str() == str_01 );
+  VERIFY( str_01.size() == strb_01.str().size() );
+  //test for ios_base::out
+  strb_03.in_avail();
+  c4 = strb_03.sputbackc(L'x');
+  VERIFY( c4 == traits_type::eof() );
+}
+
+int main()
+{
+  test04();
+  return 0;
+}
+
+
+
+// more candy!!!
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputbackc/wchar_t/9425.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputbackc/wchar_t/9425.cc
new file mode 100644
index 000000000..87b4c64b6
--- /dev/null
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputbackc/wchar_t/9425.cc
@@ -0,0 +1,42 @@
+// 2001-05-21 Benjamin Kosnik  <bkoz@redhat.com>
+
+// Copyright (C) 2001, 2002, 2003, 2004, 2009 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/>.
+
+// 27.8.1.4 Overridden virtual functions
+
+#include <sstream>
+#include <testsuite_hooks.h>
+
+// libstdc++/9439, libstdc++/9425
+// basic_filebuf<>::pbackfail calls basic_filebuf<>::seekoff, but
+// fails to check the return value
+void test09()
+{
+  using namespace std;
+  bool test __attribute__((unused)) = true;
+
+  wstringbuf sbuf;
+  wstringbuf::int_type r = sbuf.sputbackc(L'a');
+  VERIFY( r == wstringbuf::traits_type::eof() );
+}
+
+int main() 
+{
+  test09();
+  return 0;
+}