PR c++/42983, core issue 906

	PR c++/42983, core issue 906
	* method.c (defaultable_fn_check): Check virtualness.
	* include/std/thread (~_Impl_base): Move default out of line.
	* libsupc++/nested_exception.h (~nested_exception): Likewise.

From-SVN: r156672

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index fd637fbba1047982a0268b2adab235e114a214c9..11ec213bc8a640294e8d04703204ddd2d136dada 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-10  Jason Merrill  <jason@redhat.com>
+
+       PR c++/42983, core issue 906
+       * method.c (defaultable_fn_check): Check virtualness.
+
 2010-02-10  Jason Merrill  <jason@redhat.com>
 
        PR c++/43016

diff --git a/gcc/cp/method.c b/gcc/cp/method.c
index cda7ed3b863487001f40e27755c49e64d1c65af0..ccc977d9df3c2545ef8a9f2a35c70cc91ded0c12 100644 (file)
--- a/gcc/cp/method.c
+++ b/gcc/cp/method.c
@@ -1069,6 +1069,9 @@ defaultable_fn_check (tree fn)
          if (TYPE_RAISES_EXCEPTIONS (TREE_TYPE (fn)))
            error ("function %q+D defaulted on its first declaration "
                   "must not have an exception-specification", fn);
+         if (DECL_VIRTUAL_P (fn))
+           error ("%qD declared virtual cannot be defaulted in the class "
+                  "body", fn);
        }
       else if (!processing_template_decl)
        defaulted_late_check (fn);

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c63c1ff73807c33f65cf9a6ae91d17d3977c614a..1ddd79182957c0612f10e68123cafe45e259753c 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,9 @@
 2010-02-10  Jason Merrill  <jason@redhat.com>
 
+       PR c++/42983, core issue 906
+       * g++.dg/cpp0x/defaulted15.C: Add virtualness test.
+       * g++.dg/cpp0x/defaulted9.C: Move virtual default outside class.
+
        PR c++/43016
        * g++.dg/cpp0x/lambda/lambda-conv.C: Test for weakness.
 

diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted15.C b/gcc/testsuite/g++.dg/cpp0x/defaulted15.C
index 092b5605901be3668fa5803838619bd6f977cccf..b54cedb0bccb093643d2f9295e22a36aaa414f41 100644 (file)
--- a/gcc/testsuite/g++.dg/cpp0x/defaulted15.C
+++ b/gcc/testsuite/g++.dg/cpp0x/defaulted15.C
@@ -41,3 +41,8 @@ struct G: public F
   // Can't be const because F copy ctor isn't.
   G(const G&) = default;       // { dg-error "const" }
 };
+
+struct H
+{
+  virtual ~H() = default;      // { dg-error "declared virtual" }
+};

diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted9.C b/gcc/testsuite/g++.dg/cpp0x/defaulted9.C
index f083479e21d0e53c5e6ec285f3f45ff29f7dbd31..1e5e2cbf9fbc5d8f526af19d9ceaf252971c8d49 100644 (file)
--- a/gcc/testsuite/g++.dg/cpp0x/defaulted9.C
+++ b/gcc/testsuite/g++.dg/cpp0x/defaulted9.C
@@ -4,9 +4,11 @@
 struct _Impl_base
 {
   _Impl_base() = default;
-  virtual ~_Impl_base() = default;
+  virtual ~_Impl_base();
 };
 
+inline _Impl_base::~_Impl_base() = default;
+
 template<typename _Tp>
 class _Impl : public _Impl_base
 { };

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 0420fd425f0c8f5f0a535cf953a0c3895408dd47..be668b755875b84105eb8e369ec62f9c254ecd69 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2010-02-10  Jason Merrill  <jason@redhat.com>
+
+       Core issue 906
+       * include/std/thread (~_Impl_base): Move defaulted dtor out of line.
+       * libsupc++/nested_exception.h (~nested_exception): Likewise.
+       * testsuite/18_support/nested_exception/throw_with_nested.cc: Likewise.
+       * testsuite/18_support/nested_exception/rethrow_if_nested.cc: Likewise.
+
 2010-02-10  Paolo Carlini  <paolo.carlini@oracle.com>
 
        * include/tr1/hashtable.h: Fold in include/tr1_impl/hashtable.h

diff --git a/libstdc++-v3/include/std/thread b/libstdc++-v3/include/std/thread
index 2d7a7513834365a67d3575b1fca6719e7a50e8f6..628c34a7f98b27230b21172c0986aaa99fbeca63 100644 (file)
--- a/libstdc++-v3/include/std/thread
+++ b/libstdc++-v3/include/std/thread
@@ -97,7 +97,7 @@ namespace std
     {
       __shared_base_type       _M_this_ptr;
 
-      virtual ~_Impl_base() = default;
+      virtual ~_Impl_base();
 
       virtual void _M_run() = 0;
     };
@@ -193,6 +193,8 @@ namespace std
       }
   };
 
+  inline thread::_Impl_base::~_Impl_base() = default;
+
   inline void
   swap(thread& __x, thread& __y)
   { __x.swap(__y); }

diff --git a/libstdc++-v3/libsupc++/nested_exception.h b/libstdc++-v3/libsupc++/nested_exception.h
index 9b054840effca900ea5213231a8b1dcb83703275..713c33433e0a1b45c7a2434a6d448f5ca85fe4e8 100644 (file)
--- a/libstdc++-v3/libsupc++/nested_exception.h
+++ b/libstdc++-v3/libsupc++/nested_exception.h
@@ -63,7 +63,7 @@ namespace std
 
     nested_exception& operator=(const nested_exception&) = default;
 
-    virtual ~nested_exception() = default;
+    virtual ~nested_exception();
 
     void
     rethrow_nested() const __attribute__ ((__noreturn__))
@@ -74,6 +74,8 @@ namespace std
     { return _M_ptr; }
   };
 
+  inline nested_exception::~nested_exception() = default;
+
   template<typename _Except>
     struct _Nested_exception : public _Except, public nested_exception
     {

diff --git a/libstdc++-v3/testsuite/18_support/nested_exception/rethrow_if_nested.cc b/libstdc++-v3/testsuite/18_support/nested_exception/rethrow_if_nested.cc
index 37d1d80f8e89ded53e87b16d866ee8d8b0393cde..ec8d172c400e0d15fd010c251d4332ef1c4f9005 100644 (file)
--- a/libstdc++-v3/testsuite/18_support/nested_exception/rethrow_if_nested.cc
+++ b/libstdc++-v3/testsuite/18_support/nested_exception/rethrow_if_nested.cc
@@ -23,7 +23,8 @@
 
 struct derived : std::nested_exception { };
 
-struct base { virtual ~base() = default; };
+struct base { virtual ~base(); };
+inline base::~base() = default;
 
 struct derived2 : base, std::nested_exception { };
 

diff --git a/libstdc++-v3/testsuite/18_support/nested_exception/throw_with_nested.cc b/libstdc++-v3/testsuite/18_support/nested_exception/throw_with_nested.cc
index 9ce31f06f03509d3c5ef0eb9ce3ec57760f41a6d..c846d0944fbd053c1edd6829db278c2b4d2e9722 100644 (file)
--- a/libstdc++-v3/testsuite/18_support/nested_exception/throw_with_nested.cc
+++ b/libstdc++-v3/testsuite/18_support/nested_exception/throw_with_nested.cc
@@ -23,7 +23,8 @@
 
 struct derived : std::nested_exception { };
 
-struct not_derived { virtual ~not_derived() = default; };
+struct not_derived { virtual ~not_derived(); };
+inline not_derived::~not_derived() = default;
 
 void test01() 
 {