This is the mail archive of the libstdc++@gcc.gnu.org mailing list for the libstdc++ project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [v3] -fno-exceptions cleanups


... and the patch...

-benjamin
2009-08-10  Benjamin Kosnik  <bkoz@redhat.com>

	* include/std/future: Fixes for -fno-exceptions.
	* include/bits/functexcept.h: Same.
	* libsupc++/exception_ptr.h: Same.
	* src/pool_allocator.cc: Same.
	* src/future.cc: Same.
	* src/functexcept.cc: Same.
	* config/abi/pre/gnu.ver: New exports.
	* testsuite/30_threads/packaged_task/cons/assign_neg.cc: Adjust.
	* testsuite/30_threads/packaged_task/cons/copy_neg.cc: Same.
	* testsuite/30_threads/unique_future/cons/assign_neg.cc: Same.
	* testsuite/30_threads/unique_future/cons/copy_neg.cc: Same.
	* testsuite/30_threads/shared_future/cons/assign_neg.cc: Same.
	* testsuite/30_threads/promise/cons/assign_neg.cc: Same.
	* testsuite/30_threads/promise/cons/copy_neg.cc: Same.

	* testsuite/23_containers/deque/operators/1.cc: Separate in two...
	* testsuite/23_containers/deque/operators/2.cc: New.


Index: src/pool_allocator.cc
===================================================================
--- src/pool_allocator.cc	(revision 150631)
+++ src/pool_allocator.cc	(working copy)
@@ -90,11 +90,11 @@
 	
 	size_t __bytes_to_get = (2 * __total_bytes
 				 + _M_round_up(_S_heap_size >> 4));
-	try
+	__try
 	  {
 	    _S_start_free = static_cast<char*>(::operator new(__bytes_to_get));
 	  }
-	catch (...)
+	__catch (...)
 	  {
 	    // Try to make do with what we have.  That can't hurt.  We
 	    // do not try smaller requests, since that tends to result
Index: src/future.cc
===================================================================
--- src/future.cc	(revision 150631)
+++ src/future.cc	(working copy)
@@ -67,6 +67,11 @@
 namespace std
 {
   const error_category* const future_category = &__future_category_instance();
+
+  future_error::~future_error() throw() { }
+
+  const char* 
+  future_error::what() const throw() { return _M_code.message().c_str(); }
 }
 
 #endif // _GLIBCXX_HAS_GTHREADS && _GLIBCXX_USE_C99_STDINT_TR1
Index: src/functexcept.cc
===================================================================
--- src/functexcept.cc	(revision 150631)
+++ src/functexcept.cc	(working copy)
@@ -24,10 +24,11 @@
 #include <cstdlib>
 #include <exception>
 #include <stdexcept>
-#include <system_error>
 #include <new>
 #include <typeinfo>
 #include <ios>
+#include <system_error>
+#include <future>
 
 #ifdef _GLIBCXX_USE_NLS
 # include <libintl.h>
@@ -98,6 +99,11 @@
   void
   __throw_system_error(int __i)
   { throw system_error(error_code(__i, generic_category())); }
+
+  void
+  __throw_future_error(int __i)
+  { throw future_error(future_errc(__i)); }
+
 #else
   void
   __throw_bad_exception(void)
@@ -156,8 +162,13 @@
   { std::abort(); }
 
   void
-  __throw_system_error(int __i)
+  __throw_system_error(int)
   { std::abort(); }
+
+  void
+  __throw_future_error(int)
+  { std::abort(); }
+
 #endif //__EXCEPTIONS
 
 _GLIBCXX_END_NAMESPACE
Index: include/std/future
===================================================================
--- include/std/future	(revision 150631)
+++ include/std/future	(working copy)
@@ -76,20 +76,26 @@
   inline error_condition make_error_condition(future_errc __errc)
   { return error_condition(static_cast<int>(__errc), *future_category); }
 
-  /// Exception type thrown by futures.
+  /**
+   *  @brief Exception type thrown by futures.
+   *  @ingroup exceptions
+   */
   class future_error : public logic_error
   {
+    error_code _M_code;
+
   public:
     explicit future_error(future_errc __ec)
     : logic_error("std::future_error"), _M_code(make_error_code(__ec))
     { }
 
-    const error_code& code() const throw() { return _M_code; }
+    virtual ~future_error() throw();
 
-    const char* what() const throw() { return _M_code.message().c_str(); }
+    virtual const char* 
+    what() const throw();
 
-  private:
-    error_code _M_code;
+    const error_code& 
+    code() const throw() { return _M_code; }
   };
 
   // Forward declarations.
@@ -200,7 +206,7 @@
       {
         lock_guard<mutex> __lock(_M_mutex);
         if (_M_ready())
-          throw future_error(future_errc::promise_already_satisfied);
+	  __throw_future_error(int(future_errc::promise_already_satisfied));
         _M_result.swap(__res);
       }
       _M_cond.notify_all();
@@ -226,7 +232,7 @@
     _M_set_retrieved_flag()
     {
       if (_M_retrieved.test_and_set())
-        throw future_error(future_errc::future_already_retrieved);
+        __throw_future_error(int(future_errc::future_already_retrieved));
     }
 
   private:
@@ -366,7 +372,7 @@
         if (static_cast<bool>(this->_M_state))
           this->_M_state->_M_set_retrieved_flag();
         else
-          throw future_error(future_errc::future_already_retrieved);
+          __throw_future_error(int(future_errc::future_already_retrieved));
       }
 
       // copy construction from a shared_future
@@ -878,15 +884,17 @@
       unique_future<_Result>
       get_future()
       {
-        try
+        __try
         {
           return _M_promise.get_future();
         }
-        catch (const future_error& __e)
+        __catch (const future_error& __e)
         {
+#ifdef __EXCEPTIONS
           if (__e.code() == future_errc::future_already_retrieved)
-            throw std::bad_function_call();
-          throw;
+	    throw std::bad_function_call();
+	  throw;
+#endif
         }
       }
 
@@ -895,13 +903,20 @@
       operator()(_ArgTypes... __args)
       {
         if (!static_cast<bool>(_M_task) || _M_promise._M_satisfied())
-          throw std::bad_function_call();
-        try
+	  {
+#ifdef __EXCEPTIONS
+	    throw std::bad_function_call();
+#else
+	    __builtin_abort();
+#endif
+	  }
+
+        __try
         {
           _Run_task<_Result, _ArgTypes...>::_S_run(_M_promise, _M_task,
               std::forward<_ArgTypes>(__args)...);
         }
-        catch (...)
+        __catch (...)
         {
           _M_promise.set_exception(current_exception());
         }
Index: include/bits/functexcept.h
===================================================================
--- include/bits/functexcept.h	(revision 150631)
+++ include/bits/functexcept.h	(working copy)
@@ -88,6 +88,9 @@
   void
   __throw_system_error(int) __attribute__((__noreturn__));
 
+  void
+  __throw_future_error(int) __attribute__((__noreturn__));
+
 _GLIBCXX_END_NAMESPACE
 
 #endif
Index: libsupc++/exception_ptr.h
===================================================================
--- libsupc++/exception_ptr.h	(revision 150631)
+++ libsupc++/exception_ptr.h	(working copy)
@@ -156,11 +156,13 @@
     {
       __try
 	{
+#ifdef __EXCEPTIONS
 	  throw __ex;
+#endif
 	}
       __catch(...)
 	{
-	  return current_exception ();
+	  return current_exception();
 	}
     }
 
Index: testsuite/30_threads/packaged_task/cons/assign_neg.cc
===================================================================
--- testsuite/30_threads/packaged_task/cons/assign_neg.cc	(revision 150631)
+++ testsuite/30_threads/packaged_task/cons/assign_neg.cc	(working copy)
@@ -33,4 +33,4 @@
 }
 
 // { dg-error "used here" "" { target *-*-* } 32 }
-// { dg-error "deleted function" "" { target *-*-* } 856 }
+// { dg-error "deleted function" "" { target *-*-* } 862 }
Index: testsuite/30_threads/packaged_task/cons/copy_neg.cc
===================================================================
--- testsuite/30_threads/packaged_task/cons/copy_neg.cc	(revision 150631)
+++ testsuite/30_threads/packaged_task/cons/copy_neg.cc	(working copy)
@@ -32,4 +32,4 @@
 }
 
 // { dg-error "used here" "" { target *-*-* } 31 }
-// { dg-error "deleted function" "" { target *-*-* } 855 }
+// { dg-error "deleted function" "" { target *-*-* } 861 }
Index: testsuite/30_threads/shared_future/cons/assign_neg.cc
===================================================================
--- testsuite/30_threads/shared_future/cons/assign_neg.cc	(revision 150631)
+++ testsuite/30_threads/shared_future/cons/assign_neg.cc	(working copy)
@@ -35,4 +35,4 @@
 }
 
 // { dg-error "used here" "" { target *-*-* } 34 }
-// { dg-error "deleted function" "" { target *-*-* } 475 }
+// { dg-error "deleted function" "" { target *-*-* } 481 }
Index: testsuite/30_threads/unique_future/cons/assign_neg.cc
===================================================================
--- testsuite/30_threads/unique_future/cons/assign_neg.cc	(revision 150631)
+++ testsuite/30_threads/unique_future/cons/assign_neg.cc	(working copy)
@@ -35,4 +35,4 @@
 }
 
 // { dg-error "used here" "" { target *-*-* } 34 }
-// { dg-error "deleted function" "" { target *-*-* } 395 }
+// { dg-error "deleted function" "" { target *-*-* } 401 }
Index: testsuite/30_threads/unique_future/cons/copy_neg.cc
===================================================================
--- testsuite/30_threads/unique_future/cons/copy_neg.cc	(revision 150631)
+++ testsuite/30_threads/unique_future/cons/copy_neg.cc	(working copy)
@@ -34,4 +34,4 @@
 }
 
 // { dg-error "used here" "" { target *-*-* } 33 }
-// { dg-error "deleted function" "" { target *-*-* } 394 }
+// { dg-error "deleted function" "" { target *-*-* } 400 }
Index: testsuite/30_threads/promise/cons/assign_neg.cc
===================================================================
--- testsuite/30_threads/promise/cons/assign_neg.cc	(revision 150631)
+++ testsuite/30_threads/promise/cons/assign_neg.cc	(working copy)
@@ -33,4 +33,4 @@
 }
 
 // { dg-error "used here" "" { target *-*-* } 32 }
-// { dg-error "deleted function" "" { target *-*-* } 582 }
+// { dg-error "deleted function" "" { target *-*-* } 588 }
Index: testsuite/30_threads/promise/cons/copy_neg.cc
===================================================================
--- testsuite/30_threads/promise/cons/copy_neg.cc	(revision 150631)
+++ testsuite/30_threads/promise/cons/copy_neg.cc	(working copy)
@@ -32,4 +32,4 @@
 }
 
 // { dg-error "used here" "" { target *-*-* } 31 }
-// { dg-error "deleted function" "" { target *-*-* } 566 }
+// { dg-error "deleted function" "" { target *-*-* } 572 }
Index: testsuite/23_containers/deque/operators/1.cc
===================================================================
--- testsuite/23_containers/deque/operators/1.cc	(revision 150631)
+++ testsuite/23_containers/deque/operators/1.cc	(working copy)
@@ -55,30 +55,8 @@
   VERIFY( constend <= end );
 }
 
-// libstdc++/7186
-void test02()
-{
-  bool test __attribute__((unused)) = true;
-
-  std::deque<int> d(2);       
-  typedef std::deque<int>::iterator iter;         
-  typedef std::deque<int>::const_iterator constiter;
-
-  iter beg = d.begin();
-  iter end = d.end();
-  constiter constbeg = d.begin();
-  constiter constend = d.end();
-
-  VERIFY( beg - constbeg == 0 );
-  VERIFY( constend - end == 0 );
-
-  VERIFY( end - constbeg > 0 );
-  VERIFY( constend - beg > 0 );
-}
-
 int main()
 {
   test01();
-  test02();
   return 0;
 }
Index: testsuite/23_containers/deque/operators/2.cc
===================================================================
--- testsuite/23_containers/deque/operators/2.cc	(revision 0)
+++ testsuite/23_containers/deque/operators/2.cc	(revision 0)
@@ -0,0 +1,50 @@
+// 2002-05-18  Paolo Carlini  <pcarlini@unitus.it>
+
+// Copyright (C) 2002, 2004, 2005, 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/>.
+
+// 23.2.1 deque operators
+
+#include <deque>
+#include <testsuite_hooks.h>
+
+// libstdc++/7186
+void test02()
+{
+  bool test __attribute__((unused)) = true;
+
+  std::deque<int> d(2);       
+  typedef std::deque<int>::iterator iter;         
+  typedef std::deque<int>::const_iterator constiter;
+
+  iter beg = d.begin();
+  iter end = d.end();
+  constiter constbeg = d.begin();
+  constiter constend = d.end();
+
+  VERIFY( beg - constbeg == 0 );
+  VERIFY( constend - end == 0 );
+
+  VERIFY( end - constbeg > 0 );
+  VERIFY( constend - beg > 0 );
+}
+
+int main()
+{
+  test02();
+  return 0;
+}
Index: config/abi/pre/gnu.ver
===================================================================
--- config/abi/pre/gnu.ver	(revision 150631)
+++ config/abi/pre/gnu.ver	(working copy)
@@ -517,7 +517,7 @@
     _ZTVSt13bad_exception;
     _ZTVSt[0-9][0-9]basic*;
     _ZTVSt[0-9][0-9][c-d]*;
-    _ZTVSt[0-9][0-9][f-k]*;
+    _ZTVSt[0-9][0-9][g-k]*;
     _ZTVSt11logic_error;
     _ZTVSt12length_error;
     _ZTVSt[0-9][0-9][m-r]*;
@@ -545,7 +545,7 @@
     _ZTISt13bad_exception;
     _ZTISt[0-9][0-9]basic*;
     _ZTISt[0-9][0-9][c-d]*;
-    _ZTISt[0-9][0-9][f-k]*;
+    _ZTISt[0-9][0-9][g-k]*;
     _ZTISt11logic_error;
     _ZTISt12length_error;
     _ZTISt[0-9][0-9][m-r]*;
@@ -577,7 +577,7 @@
     _ZTSSt13bad_exception;
     _ZTSSt[0-9][0-9]basic*;
     _ZTSSt[0-9][0-9][c-d]*;
-    _ZTSSt[0-9][0-9][f-k]*;
+    _ZTSSt[0-9][0-9][g-k]*;
     _ZTSSt11logic_error;
     _ZTSSt12length_error;
     _ZTSSt[0-9][0-9][m-r]*;
@@ -973,6 +973,12 @@
 
     # future
     _ZSt15future_category;
+    _ZNSt12future_errorD*;
+    _ZNKSt12future_error4whatEv;
+    _ZTSSt12future_error;
+    _ZTVSt12future_error;
+    _ZTISt12future_error;
+    _ZSt20__throw_future_errori;
 
 } GLIBCXX_3.4.12;
 

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]