diff options
| author | Ville Voutilainen <ville.voutilainen@gmail.com> | 2014-08-12 20:06:11 +0300 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2014-08-12 13:06:11 -0400 |
| commit | 253e34040c869ba73d0eca1d48895b147688ab29 (patch) | |
| tree | 388aa403ff91bb1df810e0502a5a6c03a503779d | |
| parent | caff45a63534858a06e9a8f4f1d878e25f5be88a (diff) | |
| download | gcc-253e34040c869ba73d0eca1d48895b147688ab29.zip gcc-253e34040c869ba73d0eca1d48895b147688ab29.tar.gz gcc-253e34040c869ba73d0eca1d48895b147688ab29.tar.bz2 | |
Reject virt-specifiers on friends and member templates
Reject virt-specifiers on friends and member templates
* friend.c (do_friend): Diagnose virt-specifiers.
* pt.c (push_template_decl_real): Diagnose virt-specifiers.
From-SVN: r213874
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/friend.c | 4 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/override1.C | 8 |
4 files changed, 23 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 47621ca..e30dc0e 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2014-08-12 Ville Voutilainen <ville.voutilainen@gmail.com> + + Reject virt-specifiers on friends and member templates + * friend.c (do_friend): Diagnose virt-specifiers. + * pt.c (push_template_decl_real): Diagnose virt-specifiers. + 2014-08-09 Paolo Carlini <paolo.carlini@oracle.com> * typeck2.c (check_narrowing): Add tsubst_flags_t parameter, change diff --git a/gcc/cp/friend.c b/gcc/cp/friend.c index a30918c..aa66c58 100644 --- a/gcc/cp/friend.c +++ b/gcc/cp/friend.c @@ -427,6 +427,10 @@ do_friend (tree ctype, tree declarator, tree decl, /* Every decl that gets here is a friend of something. */ DECL_FRIEND_P (decl) = 1; + if (DECL_OVERRIDE_P (decl) || DECL_FINAL_P (decl)) + error ("friend declaration %qD may not have virt-specifiers", + decl); + /* Unfortunately, we have to handle attributes here. Normally we would handle them in start_decl_1, but since this is a friend decl start_decl_1 never gets to see it. */ diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 2592172..90b2720 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -4737,6 +4737,11 @@ push_template_decl_real (tree decl, bool is_friend) } else if (TREE_CODE (decl) == FUNCTION_DECL) { + if (member_template_p) + { + if (DECL_OVERRIDE_P (decl) || DECL_FINAL_P (decl)) + error ("member template %qD may not have virt-specifiers", decl); + } if (DECL_DESTRUCTOR_P (decl)) { /* [temp.mem] diff --git a/gcc/testsuite/g++.dg/cpp0x/override1.C b/gcc/testsuite/g++.dg/cpp0x/override1.C index f5f00ee..05d7290 100644 --- a/gcc/testsuite/g++.dg/cpp0x/override1.C +++ b/gcc/testsuite/g++.dg/cpp0x/override1.C @@ -52,6 +52,14 @@ struct D5 : B void D5::g() override {} // { dg-error "not allowed outside a class definition" } void g() override {} // { dg-error "not allowed outside a class definition" } +struct B5 +{ + friend void f() final; // { dg-error "may not have virt-specifiers" } + friend void g() override; // { dg-error "may not have virt-specifiers" } + template <class T> void h() final; // { dg-error "may not have virt-specifiers" } + template <class T> void i() override; // { dg-error "may not have virt-specifiers" } +}; + int main() { D2<B> d; |