From 32833537fcfcc320c8a149641b12d49d23e94609 Mon Sep 17 00:00:00 2001 From: Marek Polacek Date: Fri, 21 Jun 2019 20:43:47 +0000 Subject: [PATCH] PR c++/61490 - qualified-id in friend function definition. * decl.c (grokdeclarator): Diagnose qualified-id in friend function definition. Improve location for diagnostics of friend functions. * g++.dg/diagnostic/friend2.C: New test. * g++.dg/diagnostic/friend3.C: New test. From-SVN: r272572 --- gcc/cp/ChangeLog | 4 ++++ gcc/cp/decl.c | 22 +++++++++++++++++++--- gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/g++.dg/diagnostic/friend2.C | 10 ++++++++++ gcc/testsuite/g++.dg/diagnostic/friend3.C | 9 +++++++++ 5 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/g++.dg/diagnostic/friend2.C create mode 100644 gcc/testsuite/g++.dg/diagnostic/friend3.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 12da65ee955b..9b7529514733 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2019-06-21 Marek Polacek + PR c++/61490 - qualified-id in friend function definition. + * decl.c (grokdeclarator): Diagnose qualified-id in friend function + definition. Improve location for diagnostics of friend functions. + PR c++/60223 - ICE with T{} in non-deduced context. * pt.c (unify): Allow COMPOUND_LITERAL_P in a non-deduced context. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 85f96f737396..98b54d542a0e 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -11624,13 +11624,29 @@ grokdeclarator (const cp_declarator *declarator, friendp = 0; } if (decl_context == NORMAL) - error ("friend declaration not in class definition"); + error_at (declarator->id_loc, + "friend declaration not in class definition"); if (current_function_decl && funcdef_flag) { - error ("cannot define friend function %qs in a local " - "class definition", name); + error_at (declarator->id_loc, + "cannot define friend function %qs in a local " + "class definition", name); friendp = 0; } + /* [class.friend]/6: A function can be defined in a friend + declaration if the function name is unqualified. */ + if (funcdef_flag && in_namespace) + { + if (in_namespace == global_namespace) + error_at (declarator->id_loc, + "friend function definition %qs cannot have " + "a name qualified with %<::%>", name); + else + error_at (declarator->id_loc, + "friend function definition %qs cannot have " + "a name qualified with %<%D::%>", name, + in_namespace); + } } else if (ctype && sfk == sfk_conversion) { diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index e80c4228031c..d5367b203c42 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,9 @@ 2019-06-21 Marek Polacek + PR c++/61490 - qualified-id in friend function definition. + * g++.dg/diagnostic/friend2.C: New test. + * g++.dg/diagnostic/friend3.C: New test. + PR c++/60223 - ICE with T{} in non-deduced context. * g++.dg/cpp0x/nondeduced1.C: New test. * g++.dg/cpp0x/nondeduced2.C: New test. diff --git a/gcc/testsuite/g++.dg/diagnostic/friend2.C b/gcc/testsuite/g++.dg/diagnostic/friend2.C new file mode 100644 index 000000000000..4f4ada8bc164 --- /dev/null +++ b/gcc/testsuite/g++.dg/diagnostic/friend2.C @@ -0,0 +1,10 @@ +// PR c++/61490 +// { dg-do compile } + +namespace N { void f (); } +void f2 (); + +struct A { + friend void N::f () { } // { dg-error "15:friend function definition 'f' cannot have a name qualified with 'N::'" } + friend void ::f2 () { } // { dg-error "15:friend function definition 'f2' cannot have a name qualified with '::'" } +}; diff --git a/gcc/testsuite/g++.dg/diagnostic/friend3.C b/gcc/testsuite/g++.dg/diagnostic/friend3.C new file mode 100644 index 000000000000..574d7caa5fb6 --- /dev/null +++ b/gcc/testsuite/g++.dg/diagnostic/friend3.C @@ -0,0 +1,9 @@ +// { dg-do compile } + +void +fn () +{ + struct S { + friend void bar () { } // { dg-error "17:cannot define friend function 'bar' in a local class definition" } + }; +} -- 2.47.2