From patchwork Wed Oct 28 15:13:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathan Sidwell X-Patchwork-Id: 1389321 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=acm.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=nxq/oV67; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CLsXF3zX0z9sVV for ; Thu, 29 Oct 2020 02:13:17 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B17CB3972470; Wed, 28 Oct 2020 15:13:14 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-qk1-x733.google.com (mail-qk1-x733.google.com [IPv6:2607:f8b0:4864:20::733]) by sourceware.org (Postfix) with ESMTPS id A8F053972478 for ; Wed, 28 Oct 2020 15:13:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org A8F053972478 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=acm.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=nathanmsidwell@gmail.com Received: by mail-qk1-x733.google.com with SMTP id c6so1258722qkg.12 for ; Wed, 28 Oct 2020 08:13:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:to:from:subject:message-id:date:user-agent:mime-version :content-language; bh=av4YXgj0PcchAcIHsSX+8yCKxg224XWP3CwveAJeF1E=; b=nxq/oV67Wr2n7ZS3WDnnGpGSQ6G+MBeu8ZBC0jNPVur8C4K9yFEIuJ2P0YUXIg5+GV Pf71stiINiXAzg6LlkFww6fajPchyIFhRa/K/SvmnQQfd1AEAlgeEY7LU1vBM8suqXxd 8QKLfHKUDzu6qlgx9rnVbXUBLUdVPwHprRNmuYZIBSCQrIWtMR7du7mJNMxbaMs4G9D8 /ATqdbHqJ4j2E78Zx1Ukh4AQqs6GlxtLOOncrGgMLePzJOrC2FBA3FTok+KN9ij/UYDt Waw9lpCy0y8gh12tGFHc/4Y9NmuuWmxvP8xPUQH4J/6GnT9WLIiPZ/sNtwTrQeNyXLFB hh2A== 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=av4YXgj0PcchAcIHsSX+8yCKxg224XWP3CwveAJeF1E=; b=dKYk6gNMzVPOKivD6D6IcmWisGGa7i+/lWagYUoa3R6MtGci5bNk3WEWHgANZ/MqhL Zb4/GWIcFnLV5j2W1dijBRRhMwcTd0osj7DMav2Avw4MvmrnJDUg+AlbcD9V9ptU2+XV RJUFfg2AW2nQkAxFGK9bcMjtKLnTqR8FcCj7PJN0TA3iI617veZ6sDEhjYEW3+pW0uuR LOjuUhAktBgzNLa4+KVmwe9mOFZWymU179JVdmoUJfu8pRqdR/ludugSAOlix3UhDfUL rEcpfKXSXHIvUsATpvt8W8zRH5FSXl0lkv9lb6GKCQJBgvympB1eqr8Ds5/Gaqr12h1C 5JAw== X-Gm-Message-State: AOAM533lqmIpHLIuJ9x4dDEST9xo3TAoBeoG+E9x/2U3XjuASyI7BOWm dlaIevyvdw1qPHF8PBisNQ8= X-Google-Smtp-Source: ABdhPJzVcjDDNuXDYgcaLUtCD3FbiYw0ESh7NHrj1RvLyrXH4gviI9hArt9CIBMmx4XDUd7pWyvWkg== X-Received: by 2002:a05:620a:5a8:: with SMTP id q8mr7420363qkq.303.1603897991012; Wed, 28 Oct 2020 08:13:11 -0700 (PDT) Received: from ?IPv6:2620:10d:c0a8:1102:a5a0:ba84:c4a7:50b? ([2620:10d:c091:480::1:79b0]) by smtp.googlemail.com with ESMTPSA id q189sm1221929qke.54.2020.10.28.08.13.07 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 28 Oct 2020 08:13:08 -0700 (PDT) To: GCC Patches From: Nathan Sidwell Subject: c++: Refactor push_template_decl Message-ID: <7c0929cd-0b45-c6f2-0ee9-b964096248c7@acm.org> Date: Wed, 28 Oct 2020 11:13:06 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 Content-Language: en-US X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_EF, FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" Sadly I need to wander into push_template_decl again. But here's a piece of RAII goodness first. gcc/cp/ * pt.c (push_template_decl): Refactor for some RAII. pushing to trunk nathan diff --git i/gcc/cp/pt.c w/gcc/cp/pt.c index 3c0f2546489..0d2946fd7c4 100644 --- i/gcc/cp/pt.c +++ w/gcc/cp/pt.c @@ -5682,12 +5682,6 @@ template_parm_outer_level (tree t, void *data) tree push_template_decl (tree decl, bool is_friend) { - tree tmpl; - tree args; - tree info; - tree ctx; - bool is_primary; - bool is_partial; int new_template_p = 0; /* True if the template is a member template, in the sense of [temp.mem]. */ @@ -5697,19 +5691,20 @@ push_template_decl (tree decl, bool is_friend) return error_mark_node; /* See if this is a partial specialization. */ - is_partial = ((DECL_IMPLICIT_TYPEDEF_P (decl) - && TREE_CODE (TREE_TYPE (decl)) != ENUMERAL_TYPE - && CLASSTYPE_TEMPLATE_SPECIALIZATION (TREE_TYPE (decl))) - || (VAR_P (decl) - && DECL_LANG_SPECIFIC (decl) - && DECL_TEMPLATE_SPECIALIZATION (decl) - && TINFO_USED_TEMPLATE_ID (DECL_TEMPLATE_INFO (decl)))); + bool is_partial = ((DECL_IMPLICIT_TYPEDEF_P (decl) + && TREE_CODE (TREE_TYPE (decl)) != ENUMERAL_TYPE + && CLASSTYPE_TEMPLATE_SPECIALIZATION (TREE_TYPE (decl))) + || (VAR_P (decl) + && DECL_LANG_SPECIFIC (decl) + && DECL_TEMPLATE_SPECIALIZATION (decl) + && TINFO_USED_TEMPLATE_ID (DECL_TEMPLATE_INFO (decl)))); /* No surprising friend functions. */ gcc_checking_assert (is_friend || !(TREE_CODE (decl) == FUNCTION_DECL && DECL_UNIQUE_FRIEND_P (decl))); + tree ctx; if (is_friend) /* For a friend, we want the context of the friend, not the type of which it is a friend. */ @@ -5731,14 +5726,16 @@ push_template_decl (tree decl, bool is_friend) DECL_CONTEXT (decl) = FROB_CONTEXT (current_namespace); /* See if this is a primary template. */ + bool is_primary = false; if (is_friend && ctx && uses_template_parms_level (ctx, processing_template_decl)) /* A friend template that specifies a class context, i.e. template friend void A::f(); is not primary. */ - is_primary = false; + ; else if (TREE_CODE (decl) == TYPE_DECL && LAMBDA_TYPE_P (TREE_TYPE (decl))) - is_primary = false; + /* Lambdas are not primary. */ + ; else is_primary = template_parm_scope_p (); @@ -5871,8 +5868,9 @@ push_template_decl (tree decl, bool is_friend) if (is_partial) return process_partial_specialization (decl); - args = current_template_args (); + tree args = current_template_args (); + tree tmpl; if (!ctx || TREE_CODE (ctx) == FUNCTION_DECL || (CLASS_TYPE_P (ctx) && TYPE_BEING_DEFINED (ctx)) @@ -6077,7 +6075,7 @@ push_template_decl (tree decl, bool is_friend) if (DECL_TEMPLATE_INFO (tmpl)) args = add_outermost_template_args (DECL_TI_ARGS (tmpl), args); - info = build_template_info (tmpl, args); + tree info = build_template_info (tmpl, args); if (DECL_IMPLICIT_TYPEDEF_P (decl)) SET_TYPE_TEMPLATE_INFO (TREE_TYPE (tmpl), info);