From c3b2fdf9f82f020edf22422b5e0dd3fbdf33267f Mon Sep 17 00:00:00 2001 From: Marek Polacek Date: Sat, 25 May 2019 14:39:12 +0000 Subject: [PATCH] PR c++/90572 - wrong disambiguation in friend declaration. * parser.c (cp_parser_constructor_declarator_p): Don't allow missing typename for friend declarations. * g++.dg/cpp2a/typename16.C: New test. * g++.dg/parse/friend13.C: New test. From-SVN: r271619 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/parser.c | 14 ++++++++++++-- gcc/testsuite/ChangeLog | 6 ++++++ gcc/testsuite/g++.dg/cpp2a/typename16.C | 11 +++++++++++ gcc/testsuite/g++.dg/parse/friend13.C | 16 ++++++++++++++++ 5 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp2a/typename16.C create mode 100644 gcc/testsuite/g++.dg/parse/friend13.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 8dacb224a8c..0c37f55fe25 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2019-05-25 Marek Polacek + + PR c++/90572 - wrong disambiguation in friend declaration. + * parser.c (cp_parser_constructor_declarator_p): Don't allow missing + typename for friend declarations. + 2019-05-23 Jonathan Wakely * cp-tree.h (CP_AGGREGATE_TYPE_P): Fix whitespace. diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 1440fdb0d18..08b4105c97f 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -27593,9 +27593,19 @@ cp_parser_constructor_declarator_p (cp_parser *parser, cp_parser_flags flags, parser->num_template_parameter_lists = 0; /* Look for the type-specifier. It's not optional, but its typename - might be. */ + might be. Unless this is a friend declaration; we don't want to + treat + + friend S (T::fn)(int); + + as a constructor, but with P0634, we might assume a type when + looking for the type-specifier. It is actually a function named + `T::fn' that takes one parameter (of type `int') and returns a + value of type `S'. Constructors can be friends, but they must + use a qualified name. */ cp_parser_type_specifier (parser, - (flags & ~CP_PARSER_FLAGS_OPTIONAL), + (friend_p ? CP_PARSER_FLAGS_NONE + : (flags & ~CP_PARSER_FLAGS_OPTIONAL)), /*decl_specs=*/NULL, /*is_declarator=*/true, /*declares_class_or_enum=*/NULL, diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index a0cff00b621..998a8ffd04e 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2019-05-25 Marek Polacek + + PR c++/90572 - wrong disambiguation in friend declaration. + * g++.dg/cpp2a/typename16.C: New test. + * g++.dg/parse/friend13.C: New test. + 2019-05-24 Jakub Jelinek * c-c++-common/gomp/lastprivate-conditional-2.c (foo): Don't expect diff --git a/gcc/testsuite/g++.dg/cpp2a/typename16.C b/gcc/testsuite/g++.dg/cpp2a/typename16.C new file mode 100644 index 00000000000..7f4242a1dba --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp2a/typename16.C @@ -0,0 +1,11 @@ +// PR c++/90572 +// { dg-do compile { target c++2a } } + +struct X { X(int); }; + +template struct S { + friend X::X(T::t); +}; + +struct W { using t = int; }; +S s; diff --git a/gcc/testsuite/g++.dg/parse/friend13.C b/gcc/testsuite/g++.dg/parse/friend13.C new file mode 100644 index 00000000000..d716247a5da --- /dev/null +++ b/gcc/testsuite/g++.dg/parse/friend13.C @@ -0,0 +1,16 @@ +// PR c++/90572 + +template struct C { + friend C(T::fn)(); + friend C(T::fn)(int); + friend C(T::fn)(int, int); +}; + +struct X { }; + +template +struct B { + friend X(T::fn)(); + friend X(T::fn)(int); + friend X(T::fn)(int, int); +}; -- 2.30.2