From 815951d8f08b52d4eb893827006a40d0b48427bc Mon Sep 17 00:00:00 2001 From: Simon Martin Date: Tue, 23 Jan 2007 22:33:51 +0000 Subject: [PATCH] re PR c++/27492 (ICE on invalid covariant return type) 2007-01-23 Simon Martin PR c++/27492 * decl.c (duplicate_decls): Don't reset DECL_INVALID_OVERRIDER_P for function decls. From-SVN: r121089 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/decl.c | 1 + gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/inherit/covariant15.C | 18 ++++++++++++++++++ 4 files changed, 30 insertions(+) create mode 100644 gcc/testsuite/g++.dg/inherit/covariant15.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 65366bb4025..afc66a88d31 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2007-01-23 Simon Martin + + PR c++/27492 + * decl.c (duplicate_decls): Don't reset DECL_INVALID_OVERRIDER_P for + function decls. + 2007-01-23 Ian Lance Taylor * typeck.c (convert_for_assignment): Only warn about a = b = c diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index a100c9dc9ce..dfd199b1a7e 100644 --- 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 81f1370986c..b46cf793da6 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2007-01-23 Simon Martin + + PR c++/27492 + * g++.dg/inherit/covariant15.C: New test. + 2007-01-23 Ian Lance Taylor * 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 index 00000000000..4696cc6334a --- /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 {}; -- 2.30.2