From patchwork Wed Sep 6 13:22:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathan Sidwell X-Patchwork-Id: 810587 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-461612-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="N7w4pxTh"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xnPQc0gGfz9t2R for ; Wed, 6 Sep 2017 23:22:47 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to :from:subject:message-id:date:mime-version:content-type; q=dns; s=default; b=ymmQQ3WxE38vsSY8tfmNp+le+OLv7lRtqZhtfhIfpqaDayJ3/v JzwYdimkka+NLqYgyRsa1XqxwmrVc2EPKScH2pepiu2fNcPiP5+jQVL1NnxTVG5V 4Y9ajrFCqruSFNgs7pK8dqht60kxHYbzYOrn+DaTFPn2Q0YYTaPZu67L8= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to :from:subject:message-id:date:mime-version:content-type; s= default; bh=KH/slTdDYYnjp0ym4IPG7u1G2BQ=; b=N7w4pxThif/JuReImlbg D6xdXQ4yQXxlg24Fji7cA5B5XFDPNkRlUM8+RNaHlnFBE+E/B4nfekJaR3bsFSBt pWIkyzefdfenZW9ULcRvrqwA4YLMEA+JV6jfZLCyp4QYW3hHmcWk28+vBfbG2gcd z7KzkKXoj1hoJRgV1LMNeXc= Received: (qmail 60431 invoked by alias); 6 Sep 2017 13:22:21 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 60273 invoked by uid 89); 6 Sep 2017 13:22:20 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-10.6 required=5.0 tests=BAYES_00, FREEMAIL_FROM, GIT_PATCH_2, GIT_PATCH_3, KAM_ASCII_DIVIDERS, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=ham version=3.3.2 spammy=6346 X-HELO: mail-yw0-f169.google.com Received: from mail-yw0-f169.google.com (HELO mail-yw0-f169.google.com) (209.85.161.169) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 06 Sep 2017 13:22:17 +0000 Received: by mail-yw0-f169.google.com with SMTP id w204so21543834ywg.3 for ; Wed, 06 Sep 2017 06:22:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:to:from:subject:message-id:date :user-agent:mime-version:content-language; bh=RqOYOfjuksLU6IT+gFQ1FIwKFsF+ObSqlCWlPJmGCKI=; b=W8PrQnqd/29wtJYjxc8yeD2iHdMlfzsEP4XrITZHpRkJjjHq+1xSRG4xVPuLVsJmV0 Pvj5aC4NhG1GCjTIC3ludGrapNaSg2jofKccA7WKqCCoppeuqKYLvME2tSX2MZhAYoo2 77SPcXShm+LDqasaMnIatAIYuB8HMtQe5PC1uV76fH82oxzTnbmKvEyN87Uc7lLPwLhk BLAqag9wweiaynCXpf4WmalUW0K2JU0aFTphbPc3AQaMfi+DLY1cnXa6cNyqjLlZRwvN oe5kV+EeeE2NFHKXO06dCUIclyRNkqbslMjZLH6ysby3jRN0hKfuQivWI3SnWNzIXMQw UaZg== X-Gm-Message-State: AHPjjUhRJ8mz+Yqqd6Lt+KbJTIlJ0D0Iu34PCnukOgJ3th8X9YJbThC9 1vIb410RFon1nA== X-Google-Smtp-Source: ADKCNb5zm5BIV3cWqkEnIUBbgrUlOtfp0zkmQ/GncaiFazWiFHW+ab1T2z4igLzJXHrTXY79KQ3iiA== X-Received: by 10.37.161.68 with SMTP id z62mr2125544ybh.29.1504704135675; Wed, 06 Sep 2017 06:22:15 -0700 (PDT) Received: from ?IPv6:2620:10d:c0a3:20fb:7500:e7fb:4a6f:2254? ([2620:10d:c091:200::16fd]) by smtp.googlemail.com with ESMTPSA id p6sm1121248ywp.85.2017.09.06.06.22.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Sep 2017 06:22:15 -0700 (PDT) To: GCC Patches From: Nathan Sidwell Subject: [C++ PATCH] method vec Message-ID: <629442da-824e-499b-7a83-2223b89dec98@acm.org> Date: Wed, 6 Sep 2017 09:22:13 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 This preparatory patch fixes up a couple of places where a non-function could start appearing in the METHOD_VEC. The warn_hidden change looks bigger than necessary, because of indentation change. I noticed check_classfn could check a template mismatch earlier, and avoid doing some work. applied to trunk. nathan 2017-09-06 Nathan Sidwell * class.c (warn_hidden): Don't barf on non-functions. * decl2.c (check_classfn): Likewise. Check template match earlier. Index: class.c =================================================================== --- class.c (revision 251782) +++ class.c (working copy) @@ -2818,63 +2818,64 @@ check_for_override (tree decl, tree ctyp static void warn_hidden (tree t) { - vec *method_vec = CLASSTYPE_METHOD_VEC (t); - tree fns; - - /* We go through each separately named virtual function. */ - for (int i = 0; vec_safe_iterate (method_vec, i, &fns); ++i) - { - tree name = OVL_NAME (fns); - auto_vec base_fndecls; - tree base_binfo; - tree binfo; - int j; + if (vec *method_vec = CLASSTYPE_METHOD_VEC (t)) + for (unsigned ix = method_vec->length (); ix--;) + { + tree fns = (*method_vec)[ix]; - /* Iterate through all of the base classes looking for possibly - hidden functions. */ - for (binfo = TYPE_BINFO (t), j = 0; - BINFO_BASE_ITERATE (binfo, j, base_binfo); j++) - { - tree basetype = BINFO_TYPE (base_binfo); - get_basefndecls (name, basetype, &base_fndecls); - } + if (!OVL_P (fns)) + continue; - /* If there are no functions to hide, continue. */ - if (base_fndecls.is_empty ()) - continue; + tree name = OVL_NAME (fns); + auto_vec base_fndecls; + tree base_binfo; + tree binfo; + unsigned j; + + /* Iterate through all of the base classes looking for possibly + hidden functions. */ + for (binfo = TYPE_BINFO (t), j = 0; + BINFO_BASE_ITERATE (binfo, j, base_binfo); j++) + { + tree basetype = BINFO_TYPE (base_binfo); + get_basefndecls (name, basetype, &base_fndecls); + } - /* Remove any overridden functions. */ - for (ovl_iterator iter (fns); iter; ++iter) - { - tree fndecl = *iter; - if (TREE_CODE (fndecl) == FUNCTION_DECL - && DECL_VINDEX (fndecl)) - { - /* If the method from the base class has the same - signature as the method from the derived class, it - has been overridden. */ - for (size_t k = 0; k < base_fndecls.length (); k++) - if (base_fndecls[k] - && same_signature_p (fndecl, base_fndecls[k])) - base_fndecls[k] = NULL_TREE; - } - } + /* If there are no functions to hide, continue. */ + if (base_fndecls.is_empty ()) + continue; - /* Now give a warning for all base functions without overriders, - as they are hidden. */ - size_t k; - tree base_fndecl; - FOR_EACH_VEC_ELT (base_fndecls, k, base_fndecl) - if (base_fndecl) + /* Remove any overridden functions. */ + for (ovl_iterator iter (fns); iter; ++iter) { - /* Here we know it is a hider, and no overrider exists. */ - warning_at (location_of (base_fndecl), - OPT_Woverloaded_virtual, - "%qD was hidden", base_fndecl); - warning_at (location_of (fns), - OPT_Woverloaded_virtual, " by %qD", fns); + tree fndecl = *iter; + if (TREE_CODE (fndecl) == FUNCTION_DECL + && DECL_VINDEX (fndecl)) + { + /* If the method from the base class has the same + signature as the method from the derived class, it + has been overridden. */ + for (size_t k = 0; k < base_fndecls.length (); k++) + if (base_fndecls[k] + && same_signature_p (fndecl, base_fndecls[k])) + base_fndecls[k] = NULL_TREE; + } } - } + + /* Now give a warning for all base functions without overriders, + as they are hidden. */ + tree base_fndecl; + FOR_EACH_VEC_ELT (base_fndecls, j, base_fndecl) + if (base_fndecl) + { + /* Here we know it is a hider, and no overrider exists. */ + warning_at (location_of (base_fndecl), + OPT_Woverloaded_virtual, + "%qD was hidden", base_fndecl); + warning_at (location_of (fns), + OPT_Woverloaded_virtual, " by %qD", fns); + } + } } /* Recursive helper for finish_struct_anon. */ @@ -6981,7 +6982,7 @@ unreverse_member_declarations (tree t) /* For the TYPE_FIELDS, only the non TYPE_DECLs are in reverse order, so we can't just use nreverse. Due to stat_hack - chicanery in finish_member_declarations. */ + chicanery in finish_member_declaration. */ prev = NULL_TREE; for (x = TYPE_FIELDS (t); x && TREE_CODE (x) != TYPE_DECL; Index: decl2.c =================================================================== --- decl2.c (revision 251782) +++ decl2.c (working copy) @@ -611,6 +611,15 @@ check_classfn (tree ctype, tree function for (ovl_iterator iter (fns); !matched && iter; ++iter) { tree fndecl = *iter; + + /* A member template definition only matches a member template + declaration. */ + if (is_template != (TREE_CODE (fndecl) == TEMPLATE_DECL)) + continue; + + if (!DECL_DECLARES_FUNCTION_P (fndecl)) + continue; + tree p1 = TYPE_ARG_TYPES (TREE_TYPE (function)); tree p2 = TYPE_ARG_TYPES (TREE_TYPE (fndecl)); @@ -625,11 +634,6 @@ check_classfn (tree ctype, tree function && TREE_CODE (TREE_TYPE (function)) == METHOD_TYPE) p1 = TREE_CHAIN (p1); - /* A member template definition only matches a member template - declaration. */ - if (is_template != (TREE_CODE (fndecl) == TEMPLATE_DECL)) - continue; - /* ref-qualifier or absence of same must match. */ if (type_memfn_rqual (TREE_TYPE (function)) != type_memfn_rqual (TREE_TYPE (fndecl)))