From patchwork Wed May 24 23:11:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathan Sidwell X-Patchwork-Id: 766716 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 3wY7Sb65fHz9rxl for ; Thu, 25 May 2017 09:11:41 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="gex9oE2Q"; dkim-atps=neutral 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=RVvRMom7WQnyxESIYwJSvND97PrxOqDR/taT+FeFNh5CrOk+Cc Wcewv6UNLGiWhMY0rALpU/aQwI0xQuDDYaLskflsn+c96BBmOAkWHa+7oKfd6foi deSvbPqdkWgH+joU9JR1Dskn2Bdmo1Vy5M6ohNMOoeO3PsTSpcMZQYtZg= 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=re2lUW2inBhJ+ioHIU8KNBOAPeM=; b=gex9oE2QvXyQy8XjARjj Mcu9LU48GEV9HTb8t1O+9oom0qIrvn/pENK0ajHx3HgqVfVIhG095Qx+XFO8FUKi JmoF9mOJjwA5T1X/DFf24y6RamgACmwAdUDeVtZ2zHkLV1IBfL+4ek4rVYzJ5/KI Cx1Eh2OLVwAHxxijCodP5s0= Received: (qmail 47029 invoked by alias); 24 May 2017 23:11:25 -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 46334 invoked by uid 89); 24 May 2017 23:11:24 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-11.1 required=5.0 tests=BAYES_00, FREEMAIL_FROM, GIT_PATCH_2, GIT_PATCH_3, KAM_ASCII_DIVIDERS, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=shortcut, baggage X-HELO: mail-yb0-f171.google.com Received: from mail-yb0-f171.google.com (HELO mail-yb0-f171.google.com) (209.85.213.171) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 24 May 2017 23:11:22 +0000 Received: by mail-yb0-f171.google.com with SMTP id p143so49074549yba.2 for ; Wed, 24 May 2017 16:11:25 -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=6IjbFjG/geiWJOTNlSqTW2CdGXEiJFnywB+zEzjM6UY=; b=Ll3opDGadQJccW/QKO8irLthN8XUVIcydBBWuAQ2YatApt26FQCxA4Ut3i312Wx3D6 +rSJvBYPIhVR5hKUivEpwcFSK+xFWHppzmPzMmTxPc+GGShUK8ZArOJelLFG2baTYPx1 xxcEqO3hm0psC9/ZRmr2UJ34wXDCNEFgNhXyBWTw0kE7wzZQ4JcNFUFv1VbhOt7nSruf NH/uBa7ESND6xM7zTdrJv25BUssr6LfrApi/8MEOZLNMfmHDQWuW48i7vhq0NQBVOa1v dvcVfqObcB4gBtSNREpsv6z7rSyt6E+ZX0Vf0PWC5n3E39Mc0fa6Z7ui7SUlHFVPMJYz cmmA== X-Gm-Message-State: AODbwcCakHmkgIZzfXiK7742Fl/sGi3OXwFQynYz/o6rw+TQcjoSUnsI jAuQ7huA/8/GfQ== X-Received: by 10.37.198.12 with SMTP id k12mr28113938ybf.27.1495667484373; Wed, 24 May 2017 16:11:24 -0700 (PDT) Received: from ?IPv6:2620:10d:c0a1:1102:b9b0:1beb:d21c:b3f4? ([2620:10d:c091:180::1:11db]) by smtp.googlemail.com with ESMTPSA id d12sm695309ywa.44.2017.05.24.16.11.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 May 2017 16:11:23 -0700 (PDT) To: GCC Patches From: Nathan Sidwell Subject: [C++ PATCH] Overload cleanups Message-ID: <2b3eb82c-44aa-3440-7e15-5afbdf5d5809@acm.org> Date: Wed, 24 May 2017 19:11:21 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.1.0 MIME-Version: 1.0 here are a few more cleanups from the modules branch. firstl type_unknown_p had some historical baggage from when overloads were tree lists. No need for that, and then why not make it inline? is_overloaded_fn and friends are ripe for cleanup, and this does a little of that. Remove some use of OVL_CURRENT, which I will be killing soon. Fixed up some formatting and inconsistency in cp-tree.h whilst there. committed to trunk. nathan 2017-05-24 Nathan Sidwell * cp-tree.h (cp_free_lang_data): Add extern. (ovl_skip_hidden, is_overloaded_fn, really_overloaded_fn): Add ATTRIBUTE_PURE. (type_unknown_p): Return bool, make inline, lose TREE_LIST check. * typeck.c (type_unknown_p): Delete. * tree.c (is_overloaded_fn): Use MAYBE_BASELINE_FUNCTIONS, adjust overload management. (dependent_name): Likewise. (decl_anon_ns_mem_p): Simplify. Index: cp/cp-tree.h =================================================================== --- cp/cp-tree.h (revision 248423) +++ cp/cp-tree.h (working copy) @@ -6789,7 +6789,7 @@ extern tree finish_builtin_launder (loc /* in tree.c */ extern int cp_tree_operand_length (const_tree); extern int cp_tree_code_length (enum tree_code); -void cp_free_lang_data (tree t); +extern void cp_free_lang_data (tree t); extern tree force_target_expr (tree, tree, tsubst_flags_t); extern tree build_target_expr_with_type (tree, tree, tsubst_flags_t); extern void lang_check_failed (const char *, int, @@ -6811,7 +6811,8 @@ extern bool type_has_nontrivial_copy_ini extern void maybe_warn_parm_abi (tree, location_t); extern bool class_tmpl_impl_spec_p (const_tree); extern int zero_init_p (const_tree); -extern bool check_abi_tag_redeclaration (const_tree, const_tree, const_tree); +extern bool check_abi_tag_redeclaration (const_tree, const_tree, + const_tree); extern bool check_abi_tag_args (tree, tree); extern tree strip_typedefs (tree, bool * = NULL); extern tree strip_typedefs_expr (tree, bool * = NULL); @@ -6852,10 +6853,11 @@ extern tree ovl_make (tree fn, tree next = NULL_TREE); extern tree ovl_insert (tree fn, tree maybe_ovl, bool using_p = false); -extern tree ovl_skip_hidden (tree); +extern tree ovl_skip_hidden (tree) ATTRIBUTE_PURE; extern tree lookup_add (tree fns, tree lookup); extern void lookup_keep (tree lookup, bool keep); -extern int is_overloaded_fn (tree); +extern int is_overloaded_fn (tree) ATTRIBUTE_PURE; +extern bool really_overloaded_fn (tree) ATTRIBUTE_PURE; extern tree dependent_name (tree); extern tree get_fns (tree) ATTRIBUTE_PURE; extern tree get_first_fn (tree) ATTRIBUTE_PURE; @@ -6876,7 +6878,6 @@ extern bool decl_anon_ns_mem_p (const_ extern tree lvalue_type (tree); extern tree error_type (tree); extern int varargs_function_p (const_tree); -extern bool really_overloaded_fn (tree); extern bool cp_tree_equal (tree, tree); extern tree no_linkage_check (tree, bool); extern void debug_binfo (tree); @@ -6933,7 +6934,7 @@ extern tree require_complete_type_sfinae extern tree complete_type (tree); extern tree complete_type_or_else (tree, tree); extern tree complete_type_or_maybe_complain (tree, tree, tsubst_flags_t); -extern int type_unknown_p (const_tree); +inline bool type_unknown_p (const_tree); enum { ce_derived, ce_type, ce_normal, ce_exact }; extern bool comp_except_specs (const_tree, const_tree, int); extern bool comptypes (tree, tree, int); @@ -7311,6 +7312,12 @@ ovl_first (tree node) return node; } +inline bool +type_unknown_p (const_tree expr) +{ + return TREE_TYPE (expr) == unknown_type_node; +} + /* -- end of C++ */ #endif /* ! GCC_CP_TREE_H */ Index: cp/typeck.c =================================================================== --- cp/typeck.c (revision 248422) +++ cp/typeck.c (working copy) @@ -162,15 +162,6 @@ complete_type_or_else (tree type, tree v return complete_type_or_maybe_complain (type, value, tf_warning_or_error); } -/* Return truthvalue of whether type of EXP is instantiated. */ - -int -type_unknown_p (const_tree exp) -{ - return (TREE_CODE (exp) == TREE_LIST - || TREE_TYPE (exp) == unknown_type_node); -} - /* Return the common type of two parameter lists. We assume that comptypes has already been done and returned 1; Index: cp/tree.c =================================================================== --- cp/tree.c (revision 248423) +++ cp/tree.c (working copy) @@ -2337,15 +2337,16 @@ is_overloaded_fn (tree x) if (TREE_CODE (x) == OFFSET_REF || TREE_CODE (x) == COMPONENT_REF) x = TREE_OPERAND (x, 1); - if (BASELINK_P (x)) - x = BASELINK_FUNCTIONS (x); + x = MAYBE_BASELINK_FUNCTIONS (x); if (TREE_CODE (x) == TEMPLATE_ID_EXPR) x = TREE_OPERAND (x, 0); - if (DECL_FUNCTION_TEMPLATE_P (OVL_CURRENT (x)) - || (TREE_CODE (x) == OVERLOAD && OVL_CHAIN (x))) + + if (DECL_FUNCTION_TEMPLATE_P (OVL_FIRST (x)) + || (TREE_CODE (x) == OVERLOAD && !OVL_SINGLE_P (x))) return 2; - return (TREE_CODE (x) == FUNCTION_DECL - || TREE_CODE (x) == OVERLOAD); + + return (TREE_CODE (x) == FUNCTION_DECL + || TREE_CODE (x) == OVERLOAD); } /* X is the CALL_EXPR_FN of a CALL_EXPR. If X represents a dependent name @@ -2357,11 +2358,10 @@ dependent_name (tree x) { if (identifier_p (x)) return x; - if (TREE_CODE (x) != COMPONENT_REF - && TREE_CODE (x) != OFFSET_REF - && TREE_CODE (x) != BASELINK - && is_overloaded_fn (x)) - return DECL_NAME (get_first_fn (x)); + if (TREE_CODE (x) == TEMPLATE_ID_EXPR) + x = TREE_OPERAND (x, 0); + if (TREE_CODE (x) == OVERLOAD || TREE_CODE (x) == FUNCTION_DECL) + return OVL_NAME (x); return NULL_TREE; } @@ -3319,22 +3319,15 @@ decl_namespace_context (tree decl) bool decl_anon_ns_mem_p (const_tree decl) { - while (1) + while (TREE_CODE (decl) != NAMESPACE_DECL) { - if (decl == NULL_TREE || decl == error_mark_node) - return false; - if (TREE_CODE (decl) == NAMESPACE_DECL - && DECL_NAME (decl) == NULL_TREE) - return true; - /* Classes and namespaces inside anonymous namespaces have - TREE_PUBLIC == 0, so we can shortcut the search. */ - else if (TYPE_P (decl)) - return (TREE_PUBLIC (TYPE_MAIN_DECL (decl)) == 0); - else if (TREE_CODE (decl) == NAMESPACE_DECL) - return (TREE_PUBLIC (decl) == 0); - else - decl = DECL_CONTEXT (decl); + /* Classes inside anonymous namespaces have TREE_PUBLIC == 0. */ + if (TYPE_P (decl)) + return !TREE_PUBLIC (TYPE_MAIN_DECL (decl)); + + decl = CP_DECL_CONTEXT (decl); } + return !TREE_PUBLIC (decl); } /* Subroutine of cp_tree_equal: t1 and t2 are the CALL_EXPR_FNs of two