diff options
| author | Nathan Sidwell <nathan@acm.org> | 2017-05-16 13:15:53 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@gcc.gnu.org> | 2017-05-16 13:15:53 +0000 |
| commit | 848bf88da828bfa5467a7d07eb81f946f4937b5c (patch) | |
| tree | 7e49b3d679eccb83b4af299eb173295feeba98ac /gcc/cp/method.c | |
| parent | ba1a69079ff61eea6ab6fcf4c2784ef6221c12da (diff) | |
| download | gcc-848bf88da828bfa5467a7d07eb81f946f4937b5c.zip gcc-848bf88da828bfa5467a7d07eb81f946f4937b5c.tar.gz gcc-848bf88da828bfa5467a7d07eb81f946f4937b5c.tar.bz2 | |
cp-tree.h (OVL_FIRST, OVL_NAME): New.
* cp-tree.h (OVL_FIRST, OVL_NAME): New.
(ovl_first): New.
* constexpr.c (function_concept_check): Use OVL_FIRST.
* cvt.c (build_expr_type_conversion): Likewise.
* decl.c (poplevel, grokdeclarator): Use OVL_NAME.
* decl2.c (mark_used): Use OVL_FIRST.
* error.c (dump_decl): Use OVL_FIRST, OVL_NAME.
(dump_expr, location_of): Use OVL_FIRST.
* friend.c (do_friend): Use OVL_NAME.
* init.c (build_offset_ref): Use OVL_FIRST.
* mangle.c (write_member_name): Likewise.
(write_expression): Use OVL_NAME.
* method.c (strip_inheriting_ctors): Use OVL_FIRST.
* name-lookup.c (pushdecl_class_level): Use OVL_NAME.
* pt.c (check_explicit_specialization): Use OVL_FIRST.
(check_template_shadow): Likewise.
(tsubst_template_args): Use OVL_NAME.
(tsubst_baselink): Use OVL_FIRST.
* semantics.c (perform_koenig_lookup): Use OVL_NAME.
* tree.c (get_first_fn): Use OVL_FIRST.
* typeck.c (finish_class_member_access_expr): Use OVL_NAME.
(cp_build_addr_expr_1): Use OVL_FIRST.
From-SVN: r248108
Diffstat (limited to 'gcc/cp/method.c')
| -rw-r--r-- | gcc/cp/method.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/gcc/cp/method.c b/gcc/cp/method.c index 6a2f18c..a9bc490 100644 --- a/gcc/cp/method.c +++ b/gcc/cp/method.c @@ -502,10 +502,8 @@ strip_inheriting_ctors (tree dfn) return dfn; tree fn = dfn; while (tree inh = DECL_INHERITED_CTOR (fn)) - { - inh = OVL_CURRENT (inh); - fn = inh; - } + fn = OVL_FIRST (inh); + if (TREE_CODE (fn) == TEMPLATE_DECL && TREE_CODE (dfn) == FUNCTION_DECL) fn = DECL_TEMPLATE_RESULT (fn); |