diff options
| author | Nathan Sidwell <nathan@acm.org> | 2020-10-14 09:59:45 -0700 |
|---|---|---|
| committer | Nathan Sidwell <nathan@acm.org> | 2020-10-14 10:04:18 -0700 |
| commit | 068644a14976ce670c2b32c37e18f0aafeb05569 (patch) | |
| tree | b349fda340e8e82bbbf0e80205086754dcf2e5bf /gcc/cp/class.c | |
| parent | 06bec55e80d98419121f3998d98d969990a75b0b (diff) | |
| download | gcc-068644a14976ce670c2b32c37e18f0aafeb05569.zip gcc-068644a14976ce670c2b32c37e18f0aafeb05569.tar.gz gcc-068644a14976ce670c2b32c37e18f0aafeb05569.tar.bz2 | |
c++: DECL_FRIEND_P cleanup
DECL_FRIEND_P's meaning has changed over time. It now (almost) means
the the friend function decl has not been met via an explicit decl.
This completes that transition, renaming it to DECL_UNIQUE_FRIEND_P,
so one doesn't think it is the sole indicator of friendliness (plenty
of friends do not have the flag set). This allows reduction in the
complexity of managing the field -- all in duplicate_decls now.
gcc/cp/
* cp-tree.h (struct lang_decl_fn): Adjust context comment.
(DECL_FRIEND_P): Replace with ...
(DECL_UNIQUE_FRIEND_P): ... this. Only for FUNCTION_DECLs.
(DECL_FRIEND_CONTEXT): Adjust.
* class.c (add_implicitly_declared_members): Detect friendly
spaceship from context.
* constraint.cc (remove_constraints): Use a checking assert.
(maybe_substitute_reqs_for): Use DECL_UNIQUE_FRIEND_P.
* decl.c (check_no_redeclaration_friend_default_args):
DECL_UNIQUE_FRIEND_P is signficant, not hiddenness.
(duplicate_decls): Adjust DECL_UNIQUE_FRIEND_P clearing.
(redeclaration_error_message): Use DECL_UNIQUE_FRIEND_P.
(start_preparsed_function): Correct in-class friend processing.
Refactor some initializers.
(grokmethod): Directly check friend decl-spec.
* decl2.c (grokfield): Check DECL_UNIQUE_FRIEND_P.
* friend.c (do_friend): Set DECL_UNIQUE_FRIEND_P first, remove
extraneous conditions. Don't re set it afterwards.
* name-lookup.c (lookup_elaborated_type_1): Simplify revealing
code.
(do_pushtag): Likewise.
* pt.c (optimize_specialization_lookup_p): Check
DECL_UNIQUE_FRIEND_P.
(push_template_decl): Likewise. Drop unneeded friend setting.
(type_dependent_expression_p): Check DECL_UNIQUE_FRIEND_P.
libcc1/
* libcp1plugin.cc (plugin_add_friend): Set DECL_UNIQUE_FRIEND_P.
Diffstat (limited to 'gcc/cp/class.c')
| -rw-r--r-- | gcc/cp/class.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gcc/cp/class.c b/gcc/cp/class.c index 01780fe..26f996b 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -3283,7 +3283,8 @@ add_implicitly_declared_members (tree t, tree* access_decls, { tree eq = implicitly_declare_fn (sfk_comparison, t, false, space, NULL_TREE); - if (DECL_FRIEND_P (space)) + bool is_friend = DECL_CONTEXT (space) != t; + if (is_friend) do_friend (NULL_TREE, DECL_NAME (eq), eq, NULL_TREE, NO_SPECIAL, true); else @@ -3292,7 +3293,7 @@ add_implicitly_declared_members (tree t, tree* access_decls, DECL_CHAIN (eq) = TYPE_FIELDS (t); TYPE_FIELDS (t) = eq; } - maybe_add_class_template_decl_list (t, eq, DECL_FRIEND_P (space)); + maybe_add_class_template_decl_list (t, eq, is_friend); } while (*access_decls) |