2007-01-23 Simon Martin <simartin@users.sourceforge.net>

	PR c++/27492
	* decl.c (duplicate_decls): Don't reset DECL_INVALID_OVERRIDER_P for
	function decls.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@121089 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 65366bb..afc66a8 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-23  Simon Martin  <simartin@users.sourceforge.net>
+
+       PR c++/27492
+       * decl.c (duplicate_decls): Don't reset DECL_INVALID_OVERRIDER_P for
+       function decls.
+
 2007-01-23  Ian Lance Taylor  <iant@google.com>
 
        * typeck.c (convert_for_assignment): Only warn about a = b = c

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index a100c9d..dfd199b 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -1576,6 +1576,7 @@ duplicate_decls (tree newdecl, tree olddecl, bool newdecl_is_friend)
       DECL_STATIC_DESTRUCTOR (newdecl) |= DECL_STATIC_DESTRUCTOR (olddecl);
       DECL_PURE_VIRTUAL_P (newdecl) |= DECL_PURE_VIRTUAL_P (olddecl);
       DECL_VIRTUAL_P (newdecl) |= DECL_VIRTUAL_P (olddecl);
+      DECL_INVALID_OVERRIDER_P (newdecl) |= DECL_INVALID_OVERRIDER_P (olddecl);
       DECL_THIS_STATIC (newdecl) |= DECL_THIS_STATIC (olddecl);
       if (DECL_OVERLOADED_OPERATOR_P (olddecl) != ERROR_MARK)
        SET_OVERLOADED_OPERATOR_CODE

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 81f1370..b46cf79 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-23  Simon Martin  <simartin@users.sourceforge.net>
+
+       PR c++/27492
+       * g++.dg/inherit/covariant15.C: New test.
+
 2007-01-23  Ian Lance Taylor  <iant@google.com>
 
        * g++.dg/warn/Wparentheses-24.C: New test.

diff --git a/gcc/testsuite/g++.dg/inherit/covariant15.C b/gcc/testsuite/g++.dg/inherit/covariant15.C
new file mode 100644 (file)
index 0000000..4696cc6
--- /dev/null
+++ b/gcc/testsuite/g++.dg/inherit/covariant15.C
@@ -0,0 +1,18 @@
+/* This used to ICE (PR c++/27492) */
+/* { dg-do "compile" } */
+
+struct A {};
+
+class B : A
+{
+    virtual A* foo(); /* { dg-error "overriding" } */
+};
+
+struct C : virtual B
+{
+    virtual C* foo(); /* { dg-error "invalid covariant return type" } */
+};
+
+C* C::foo() { return 0; }
+
+struct D : C {};