diff options
| author | Nathan Sidwell <nathan@acm.org> | 2017-09-06 11:17:54 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@gcc.gnu.org> | 2017-09-06 11:17:54 +0000 |
| commit | 527b7b195744f1cf687ebca87d748edf7840970e (patch) | |
| tree | bacd9c22d85bd36b8a497d12f60d0d0ea8e16a15 /gcc/cp/call.c | |
| parent | b276ab7a45afb2181df553fcf064d1fc80a1a450 (diff) | |
| download | gcc-527b7b195744f1cf687ebca87d748edf7840970e.zip gcc-527b7b195744f1cf687ebca87d748edf7840970e.tar.gz gcc-527b7b195744f1cf687ebca87d748edf7840970e.tar.bz2 | |
name-lookup.h (lookup_fnfields_slot_nolazy, [...]): Rename to ...
* name-lookup.h (lookup_fnfields_slot_nolazy,
lookup_fnfields_slot): Rename to ...
(get_class_binding_direct, get_class_binding): ... here.
* name-lookup.c (lookup_fnfields_slot_nolazy,
lookup_fnfields_slot): Rename to ...
(get_class_binding_direct, get_class_binding): ... here.
* cp-tree.h (CLASSTYPE_CONSTRUCTORS, CLASSTYPE_DESTRUCTOR): Adjust.
* call.c (build_user_type_conversion_1): Adjust.
(has_trivial_copy_assign_p): Adjust.
(has_trivial_copy_p): Adjust.
* class.c (get_basefndecls) Adjust.
(vbase_has_user_provided_move_assign) Adjust.
(classtype_has_move_assign_or_move_ctor_p): Adjust.
(type_build_ctor_call, type_build_dtor_call): Adjust.
* decl.c (register_dtor_fn): Adjust.
* decl2.c (check_classfn): Adjust.
* pt.c (retrieve_specialization): Adjust.
(check_explicit_specialization): Adjust.
(do_class_deduction): Adjust.
* search.c (lookup_field_r): Adjust.
(look_for_overrides_here, lookup_conversions_r): Adjust.
* semantics.c (classtype_has_nothrow_assign_or_copy_p): Adjust.
* tree.c (type_has_nontrivial_copy_init): Adjust.
* method.c (lazily_declare_fn): Adjust comment.
From-SVN: r251780
Diffstat (limited to 'gcc/cp/call.c')
| -rw-r--r-- | gcc/cp/call.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 9e4a5c1..88af0d3 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -3738,7 +3738,7 @@ build_user_type_conversion_1 (tree totype, tree expr, int flags, if (CLASS_TYPE_P (totype)) /* Use lookup_fnfields_slot instead of lookup_fnfields to avoid creating a garbage BASELINK; constructors can't be inherited. */ - ctors = lookup_fnfields_slot (totype, complete_ctor_identifier); + ctors = get_class_binding (totype, complete_ctor_identifier); /* FIXME P0135 doesn't say what to do in C++17 about list-initialization from a single element. For now, let's handle constructors as before and also @@ -8243,9 +8243,7 @@ first_non_public_field (tree type) static bool has_trivial_copy_assign_p (tree type, bool access, bool *hasassign) { - tree fns = cp_assignment_operator_id (NOP_EXPR); - fns = lookup_fnfields_slot (type, fns); - + tree fns = get_class_binding (type, cp_assignment_operator_id (NOP_EXPR)); bool all_trivial = true; /* Iterate over overloads of the assignment operator, checking @@ -8294,8 +8292,7 @@ has_trivial_copy_assign_p (tree type, bool access, bool *hasassign) static bool has_trivial_copy_p (tree type, bool access, bool hasctor[2]) { - tree fns = lookup_fnfields_slot (type, complete_ctor_identifier); - + tree fns = get_class_binding (type, complete_ctor_identifier); bool all_trivial = true; for (ovl_iterator oi (fns); oi; ++oi) |