2008-08-22 Paolo Carlini <paolo.carlini@oracle.com>

	Revert again the N2179 patch.

From-SVN: r139497

1 files changed, 0 insertions, 238 deletions

diff --git a/libstdc++-v3/libsupc++/eh_ptr.cc b/libstdc++-v3/libsupc++/eh_ptr.cc
deleted file mode 100644
index ce6c1720005..00000000000
--- a/libstdc++-v3/libsupc++/eh_ptr.cc
+++ /dev/null
@@ -1,238 +0,0 @@
-// -*- C++ -*- Implement the members of exception_ptr.
-// Copyright (C) 2008 Free Software Foundation, Inc.
-//
-// This file is part of GCC.
-//
-// GCC 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 2, or (at your option)
-// any later version.
-//
-// GCC 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 GCC; see the file COPYING.  If not, write to
-// the Free Software Foundation, 51 Franklin Street, Fifth Floor,
-// Boston, MA 02110-1301, USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-#include <bits/c++config.h>
-#include <exception>
-#include <exception_ptr.h>
-#include "unwind-cxx.h"
-
-using namespace __cxxabiv1;
-
-
-std::__exception_ptr::exception_ptr::exception_ptr() throw()
-  : _M_exception_object(0)
-{
-}
-
-
-std::__exception_ptr::exception_ptr::exception_ptr(void* obj) throw()
-  : _M_exception_object(obj)
-{
-  _M_addref();
-}
-
-
-std::__exception_ptr::exception_ptr::exception_ptr(__safe_bool) throw()
-  : _M_exception_object(0)
-{
-}
-
-
-std::__exception_ptr::exception_ptr::exception_ptr(
-                        const exception_ptr& other) throw()
-  : _M_exception_object(other._M_exception_object)
-{
-  _M_addref();
-}
-
-
-std::__exception_ptr::exception_ptr::~exception_ptr() throw()
-{
-  _M_release();
-}
-
-
-std::__exception_ptr::exception_ptr&
-std::__exception_ptr::exception_ptr::operator=(
-                    const exception_ptr& other) throw()
-{
-  exception_ptr(other).swap(*this);
-  return *this;
-}
-
-
-void
-std::__exception_ptr::exception_ptr::_M_addref() throw()
-{
-  if (_M_exception_object)
-    {
-      __cxa_exception *eh =
-        __get_exception_header_from_obj (_M_exception_object);
-      __gnu_cxx::__atomic_add_dispatch (&eh->referenceCount, 1);
-    }
-}
-
-
-void
-std::__exception_ptr::exception_ptr::_M_release() throw()
-{
-  if (_M_exception_object)
-    {
-      __cxa_exception *eh =
-        __get_exception_header_from_obj (_M_exception_object);
-      if (__gnu_cxx::__exchange_and_add_dispatch (&eh->referenceCount, -1) == 0)
-        {
-          if (eh->exceptionDestructor)
-            eh->exceptionDestructor (_M_exception_object);
-
-          __cxa_free_exception (_M_exception_object);
-          _M_exception_object = 0;
-        }
-    }
-}
-
-
-void*
-std::__exception_ptr::exception_ptr::_M_get() const throw()
-{
-  return _M_exception_object;
-}
-
-
-void
-std::__exception_ptr::exception_ptr::_M_safe_bool_dummy()
-{
-}
-
-
-void
-std::__exception_ptr::exception_ptr::swap(exception_ptr &other) throw()
-{
-  void *tmp = _M_exception_object;
-  _M_exception_object = other._M_exception_object;
-  other._M_exception_object = tmp;
-}
-
-
-bool
-std::__exception_ptr::exception_ptr::operator!() const throw()
-{
-  return _M_exception_object == 0;
-}
-
-
-std::__exception_ptr::exception_ptr::operator __safe_bool() const throw()
-{
-  return _M_exception_object ? &exception_ptr::_M_safe_bool_dummy : 0;
-}
-
-
-const std::type_info*
-std::__exception_ptr::exception_ptr::__cxa_exception_type() const throw()
-{
-  __cxa_exception *eh = __get_exception_header_from_obj (_M_exception_object);
-  return eh->exceptionType;
-}
-
-
-bool std::__exception_ptr::operator==(const exception_ptr& lhs,
-                                      const exception_ptr& rhs) throw()
-{
-  return lhs._M_exception_object == rhs._M_exception_object;
-}
-
-
-bool std::__exception_ptr::operator!=(const exception_ptr& lhs,
-                                      const exception_ptr& rhs) throw()
-{
-  return !(lhs == rhs);
-}
-
-
-std::exception_ptr
-std::current_exception() throw()
-{
-  __cxa_eh_globals *globals = __cxa_get_globals ();
-  __cxa_exception *header = globals->caughtExceptions;
-
-  if (!header)
-    return std::exception_ptr();
-
-  // Since foreign exceptions can't be counted, we can't return them.
-  if (!__is_gxx_exception_class (header->unwindHeader.exception_class))
-    return std::exception_ptr();
-
-  return std::exception_ptr(
-    __get_object_from_ambiguous_exception (header));
-}
-
-
-static void
-__gxx_dependent_exception_cleanup (_Unwind_Reason_Code code,
-                                   _Unwind_Exception *exc)
-{
-  // This cleanup is set only for dependents.
-  __cxa_dependent_exception *dep = __get_dependent_exception_from_ue (exc);
-  __cxa_exception *header =
-    __get_exception_header_from_obj (dep->primaryException);
-
-  // We only want to be called through _Unwind_DeleteException.
-  // _Unwind_DeleteException in the HP-UX IA64 libunwind library
-  // returns _URC_NO_REASON and not _URC_FOREIGN_EXCEPTION_CAUGHT
-  // like the GCC _Unwind_DeleteException function does.
-  if (code != _URC_FOREIGN_EXCEPTION_CAUGHT && code != _URC_NO_REASON)
-    __terminate (header->terminateHandler);
-
-  __cxa_free_dependent_exception (dep);
-
-  if (__gnu_cxx::__exchange_and_add_dispatch (&header->referenceCount, -1) == 0)
-    {
-      if (header->exceptionDestructor)
-        header->exceptionDestructor (header + 1);
-
-      __cxa_free_exception (header + 1);
-    }
-}
-
-
-void
-std::rethrow_exception(std::exception_ptr ep)
-{
-  void *obj = ep._M_get();
-  __cxa_exception *eh = __get_exception_header_from_obj (obj);
-
-  __cxa_dependent_exception *dep = __cxa_allocate_dependent_exception ();
-  dep->primaryException = obj;
-  __gnu_cxx::__atomic_add_dispatch (&eh->referenceCount, 1);
-
-  dep->unexpectedHandler = __unexpected_handler;
-  dep->terminateHandler = __terminate_handler;
-  __GXX_INIT_DEPENDENT_EXCEPTION_CLASS(dep->unwindHeader.exception_class);
-  dep->unwindHeader.exception_cleanup = __gxx_dependent_exception_cleanup;
-
-#ifdef _GLIBCXX_SJLJ_EXCEPTIONS
-  _Unwind_SjLj_RaiseException (&dep->unwindHeader);
-#else
-  _Unwind_RaiseException (&dep->unwindHeader);
-#endif
-
-  // Some sort of unwinding error.  Note that terminate is a handler.
-  __cxa_begin_catch (&dep->unwindHeader);
-  std::terminate ();
-}