Patchwork [v3] fix PR 55728 and PR 55847

login
register
mail settings
Submitter Jonathan Wakely
Date Jan. 7, 2013, 12:50 a.m.
Message ID <CAH6eHdRnOCSN6FDScpD_k_fpnpWGpJNLZV3KNWFEHvg60EcKLQ@mail.gmail.com>
Download mbox | patch
Permalink /patch/209844/
State New
Headers show

Comments

Jonathan Wakely - Jan. 7, 2013, 12:50 a.m.
PR libstdc++/55847
	* src/c++11/shared_ptr.cc (bad_weak_ptr::what()): Correct string.

	PR libstdc++/55728
	* include/std/functional (bad_function_call::what()): Declare.
	* src/c++11/functional.cc (bad_function_call::what()): Define.
	* config/abi/pre/gnu.ver (bad_function_call::what()): Export.
	* testsuite/20_util/bad_function_call/what.cc: New.

Tested x86_64-linux, committed to trunk.
commit e23405d43828180dff54f54e40e131a769e2c842
Author: Jonathan Wakely <jwakely.gcc@gmail.com>
Date:   Mon Jan 7 00:13:18 2013 +0000

    	PR libstdc++/55847
    	* src/c++11/shared_ptr.cc (bad_weak_ptr::what()): Correct string.
    	* testsuite/20_util/shared_ptr/cons/weak_ptr_expired.cc: Verify
    	string.
    
    	PR libstdc++/55728
    	* include/std/functional (bad_function_call::what()): Declare.
    	* src/c++11/functional.cc (bad_function_call::what()): Define.
    	* config/abi/pre/gnu.ver (bad_function_call::what()): Export.
    	* testsuite/20_util/bad_function_call/what.cc: New.

Patch

diff --git a/libstdc++-v3/config/abi/pre/gnu.ver b/libstdc++-v3/config/abi/pre/gnu.ver
index 8b1ec0d..35b4c44 100644
--- a/libstdc++-v3/config/abi/pre/gnu.ver
+++ b/libstdc++-v3/config/abi/pre/gnu.ver
@@ -1342,6 +1342,9 @@  GLIBCXX_3.4.18 {
     # std::this_thread::__sleep_for
     _ZNSt11this_thread11__sleep_for*;
 
+    # std::bad_function_call::what()
+    _ZNKSt17bad_function_call4whatEv;
+
 } GLIBCXX_3.4.17;
 
 # Symbols in the support library (libsupc++) have their own tag.
diff --git a/libstdc++-v3/include/std/functional b/libstdc++-v3/include/std/functional
index 3ec2e1e..0b5d475 100644
--- a/libstdc++-v3/include/std/functional
+++ b/libstdc++-v3/include/std/functional
@@ -1,6 +1,6 @@ 
 // <functional> -*- C++ -*-
 
-// Copyright (C) 2001-2012 Free Software Foundation, Inc.
+// Copyright (C) 2001-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
@@ -1767,6 +1767,8 @@  _GLIBCXX_HAS_NESTED_TYPE(result_type)
   {
   public:
     virtual ~bad_function_call() noexcept;
+
+    const char* what() const noexcept;
   };
 
   /**
diff --git a/libstdc++-v3/src/c++11/functional.cc b/libstdc++-v3/src/c++11/functional.cc
index 2ab3405..8d81f60 100644
--- a/libstdc++-v3/src/c++11/functional.cc
+++ b/libstdc++-v3/src/c++11/functional.cc
@@ -1,7 +1,6 @@ 
 // Support for <functional> -*- C++ -*-
 
-// Copyright (C) 2011
-// Free Software Foundation, Inc.
+// Copyright (C) 2011-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
@@ -29,7 +28,11 @@  namespace std _GLIBCXX_VISIBILITY(default)
 {
 _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
-  bad_function_call::~bad_function_call() throw() = default;
+  bad_function_call::~bad_function_call() noexcept = default;
+
+  const char*
+  bad_function_call::what() const noexcept
+  { return "bad_function_call"; }
 
 _GLIBCXX_END_NAMESPACE_VERSION
 } // namespace
diff --git a/libstdc++-v3/src/c++11/shared_ptr.cc b/libstdc++-v3/src/c++11/shared_ptr.cc
index 911e745..ca5714a 100644
--- a/libstdc++-v3/src/c++11/shared_ptr.cc
+++ b/libstdc++-v3/src/c++11/shared_ptr.cc
@@ -1,7 +1,6 @@ 
 // Support for pointer abstractions -*- C++ -*-
 
-// Copyright (C) 2011
-// Free Software Foundation, Inc.
+// Copyright (C) 2011-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
@@ -33,7 +32,7 @@  _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
   char const*
   bad_weak_ptr::what() const noexcept
-  { return "std::bad_weak_ptr"; }
+  { return "bad_weak_ptr"; }
 
 _GLIBCXX_END_NAMESPACE_VERSION
 } // namespace
diff --git a/libstdc++-v3/testsuite/20_util/bad_function_call/what.cc b/libstdc++-v3/testsuite/20_util/bad_function_call/what.cc
new file mode 100644
index 0000000..4d9c8b4
--- /dev/null
+++ b/libstdc++-v3/testsuite/20_util/bad_function_call/what.cc
@@ -0,0 +1,33 @@ 
+// { dg-options "-std=gnu++11" }
+
+// 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 <functional>
+#include <testsuite_hooks.h>
+
+int main()
+{
+  try
+  {
+    std::function<void()>{}();
+  }
+  catch (const std::exception& e)
+  {
+    VERIFY( e.what() == std::string("bad_function_call") );
+  }
+}
diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/weak_ptr_expired.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/weak_ptr_expired.cc
index d2bf508..2d655d7 100644
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/weak_ptr_expired.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/weak_ptr_expired.cc
@@ -1,6 +1,6 @@ 
 // { dg-options "-std=gnu++0x" }
 
-// Copyright (C) 2005, 2006, 2007, 2009, 2012 Free Software Foundation
+// Copyright (C) 2005-2013 Free Software Foundation
 //
 // 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
@@ -40,10 +40,11 @@  test01()
   {
     std::shared_ptr<A> a2(wa);
   }
-  catch (const std::bad_weak_ptr&)
+  catch (const std::bad_weak_ptr& e)
   {
     // Expected.
-    test = true;
+    if (e.what() == std::string("bad_weak_ptr"))
+      test = true;
   }
   VERIFY( test );