From 253e34040c869ba73d0eca1d48895b147688ab29 Mon Sep 17 00:00:00 2001 From: Ville Voutilainen Date: Tue, 12 Aug 2014 20:06:11 +0300 Subject: [PATCH] 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 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/friend.c | 4 ++++ gcc/cp/pt.c | 5 +++++ gcc/testsuite/g++.dg/cpp0x/override1.C | 8 ++++++++ 4 files changed, 23 insertions(+) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 47621ca0e86..e30dc0e4636 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2014-08-12 Ville Voutilainen + + 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 * typeck2.c (check_narrowing): Add tsubst_flags_t parameter, change diff --git a/gcc/cp/friend.c b/gcc/cp/friend.c index a30918c0006..aa66c58568f 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 25921722f38..90b2720ef9c 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 f5f00ee9f51..05d729084da 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 void h() final; // { dg-error "may not have virt-specifiers" } + template void i() override; // { dg-error "may not have virt-specifiers" } +}; + int main() { D2 d; -- 2.30.2