[pushed] c++: namespace-scoped friend in local class [PR69410]
Checks
Commit Message
Tested x86_64-pc-linux-gnu, applying to trunk.
-- 8< --
do_friend was only considering class-qualified identifiers for the
qualified-id case, but we also need to skip local scope when there's an
explicit namespace scope.
PR c++/69410
gcc/cp/ChangeLog:
* friend.cc (do_friend): Handle namespace as scope argument.
* decl.cc (grokdeclarator): Pass down in_namespace.
gcc/testsuite/ChangeLog:
* g++.dg/lookup/friend24.C: New test.
---
gcc/cp/decl.cc | 3 ++-
gcc/cp/friend.cc | 21 +++++++++++++++++----
gcc/testsuite/g++.dg/lookup/friend24.C | 9 +++++++++
3 files changed, 28 insertions(+), 5 deletions(-)
create mode 100644 gcc/testsuite/g++.dg/lookup/friend24.C
base-commit: 103d423f6ce72ccb03d55b7b1dfa2dabd5854371
@@ -14393,7 +14393,8 @@ grokdeclarator (const cp_declarator *declarator,
cplus_decl_attributes (&decl, *attrlist, 0);
*attrlist = NULL_TREE;
- decl = do_friend (ctype, unqualified_id, decl,
+ tree scope = ctype ? ctype : in_namespace;
+ decl = do_friend (scope, unqualified_id, decl,
flags, funcdef_flag);
return decl;
}
@@ -487,19 +487,32 @@ make_friend_class (tree type, tree friend_type, bool complain)
}
/* Record DECL (a FUNCTION_DECL) as a friend of the
- CURRENT_CLASS_TYPE. If DECL is a member function, CTYPE is the
+ CURRENT_CLASS_TYPE. If DECL is a member function, SCOPE is the
class of which it is a member, as named in the friend declaration.
+ If the friend declaration was explicitly namespace-qualified, SCOPE
+ is that namespace.
DECLARATOR is the name of the friend. FUNCDEF_FLAG is true if the
friend declaration is a definition of the function. FLAGS is as
for grokclass fn. */
tree
-do_friend (tree ctype, tree declarator, tree decl,
+do_friend (tree scope, tree declarator, tree decl,
enum overload_flags flags,
bool funcdef_flag)
{
gcc_assert (TREE_CODE (decl) == FUNCTION_DECL);
- gcc_assert (!ctype || MAYBE_CLASS_TYPE_P (ctype));
+
+ tree ctype = NULL_TREE;
+ tree in_namespace = NULL_TREE;
+ if (!scope)
+ ;
+ else if (MAYBE_CLASS_TYPE_P (scope))
+ ctype = scope;
+ else
+ {
+ gcc_checking_assert (TREE_CODE (scope) == NAMESPACE_DECL);
+ in_namespace = scope;
+ }
/* Friend functions are unique, until proved otherwise. */
DECL_UNIQUE_FRIEND_P (decl) = 1;
@@ -609,7 +622,7 @@ do_friend (tree ctype, tree declarator, tree decl,
parameters. Instead, we call pushdecl when the class
is instantiated. */
decl = push_template_decl (decl, /*is_friend=*/true);
- else if (current_function_decl)
+ else if (current_function_decl && !in_namespace)
/* pushdecl will check there's a local decl already. */
decl = pushdecl (decl, /*hiding=*/true);
else
new file mode 100644
@@ -0,0 +1,9 @@
+// PR c++/69410
+
+void a();
+void f() {
+ class A {
+ friend void ::a();
+ friend class Z;
+ };
+}