diff options
| author | Simon Martin <simartin@users.sourceforge.net> | 2007-01-23 22:33:51 +0000 |
|---|---|---|
| committer | Simon Martin <simartin@gcc.gnu.org> | 2007-01-23 22:33:51 +0000 |
| commit | 815951d8f08b52d4eb893827006a40d0b48427bc (patch) | |
| tree | b320b1b486f928f965fef64e2fc15b2fe268e454 | |
| parent | a99e5cb4d8364de480cbad919100b74ce7b0d378 (diff) | |
| download | gcc-815951d8f08b52d4eb893827006a40d0b48427bc.zip gcc-815951d8f08b52d4eb893827006a40d0b48427bc.tar.gz gcc-815951d8f08b52d4eb893827006a40d0b48427bc.tar.bz2 | |
re PR c++/27492 (ICE on invalid covariant return type)
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.
From-SVN: r121089
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 1 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/inherit/covariant15.C | 18 |
4 files changed, 30 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 65366bb..afc66a8 100644 --- 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 --- 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 --- 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 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 {}; |