From patchwork Wed Jul 22 15:41:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathan Sidwell X-Patchwork-Id: 1333960 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=pK1GZAG/; 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 4BBfpC0kyxz9sR4 for ; Thu, 23 Jul 2020 01:41:38 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id F2A283857005; Wed, 22 Jul 2020 15:41:34 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-qk1-x736.google.com (mail-qk1-x736.google.com [IPv6:2607:f8b0:4864:20::736]) by sourceware.org (Postfix) with ESMTPS id CB1333857C6A for ; Wed, 22 Jul 2020 15:41:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org CB1333857C6A 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-x736.google.com with SMTP id 11so2417683qkn.2 for ; Wed, 22 Jul 2020 08:41:32 -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=aQZkXFW4T1Ey3AWBlPLv3dgLC306AQ5Btz/RA2FctKE=; b=pK1GZAG/AIqTi0INwjrFY+iA2sIxQF11usALeFI3FhHGAL5ekbXYF1uAeHx1KZ3+Y5 cYbWOegDudNEqB2k7IxkwXRI+tKw87tTh3CcPt1kHBzQuQ0ISS8WfDz4va71knLqLrLx TL5HdN1EyEhFqp6vcdSe8NIte/ifw25NHlH2CR5Kx0KfEYzuIqJFkNnlquOWZ2JQDJdJ moTst/KY72IaqfDTsrQBSRU9drOcOJPYeKwEQWEYPs2/QqoVnCGUmTyuqezfD85hAr7k rxo5WchYhIbV/MNmoAxTYYaboSPyKqXTzJOnCuGDPMwKUdYA9A5MXairLk5zRqtCrzVf PtiQ== 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=aQZkXFW4T1Ey3AWBlPLv3dgLC306AQ5Btz/RA2FctKE=; b=nKOt0JQf5p6lWcYdyg52qUtuuUmi6KcyYQ+qrGR/0sewp2yczQNhzDfI+TxKllmtaJ 6dhWuzZqnpSm26Sz3OUgmEEGDjj197z9DGG72nXMJzNm9y1EIEGoltFw/IFh//90+Og7 udgv6TMF0yTLN2UttULoKuEALHbzYGA7oIc1wvFDrtVHufUYBsopfNn06vYYL/21WTJP UQeaP/xOUBXfl3L2n7OCkvec4305DOWzGk7kcbySl7ksVGkaoD7ckelcyXXLxiQr1yDQ axlOLEmwlHgI1UswzB/hCGjO7lzwBwbCh9yAM1J9vHyqWhaiZ+KpCx+0N5EVCabA4sQM lCLA== X-Gm-Message-State: AOAM533Z3zRueA3JGBJAcbBIcwEH0F0j298wKNXIRfypkfp/D8OZIcxa +RB/8cwnECCidZqTrp91/q2kxEjx X-Google-Smtp-Source: ABdhPJxxmlR36tQW/RAPSDdAQrQ9OsIv8xMgKHbaGqpJLUF6lfsSXIAQfPcNHyhfJvhBnWHHWiDKrw== X-Received: by 2002:a05:620a:40c1:: with SMTP id g1mr520982qko.391.1595432491036; Wed, 22 Jul 2020 08:41:31 -0700 (PDT) Received: from ?IPv6:2620:10d:c0a8:1102:4db8:f069:3bbe:89cf? ([2620:10d:c091:480::1:d26c]) by smtp.googlemail.com with ESMTPSA id w27sm18970qtv.68.2020.07.22.08.41.30 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 22 Jul 2020 08:41:30 -0700 (PDT) To: GCC Patches From: Nathan Sidwell Subject: c++: Don't add enums to class's decl_list Message-ID: <25dc6bf7-9038-20fd-373c-15d60a8e495e@acm.org> Date: Wed, 22 Jul 2020 11:41:29 -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=-10.3 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" We don't need to add CONST_DECLs to a template decl's decl list. Also made the code flow a bit clearer. gcc/cp/ * class.c (maybe_add_class_template_decl_list): Don't add CONST_DECLs. nathan diff --git i/gcc/cp/class.c w/gcc/cp/class.c index 803b33bf346..a3913f4ce0b 100644 --- i/gcc/cp/class.c +++ w/gcc/cp/class.c @@ -3049,11 +3049,14 @@ finish_struct_anon (tree t) void maybe_add_class_template_decl_list (tree type, tree t, int friend_p) { - /* Save some memory by not creating TREE_LIST if TYPE is not template. */ - if (CLASSTYPE_TEMPLATE_INFO (type)) - CLASSTYPE_DECL_LIST (type) - = tree_cons (friend_p ? NULL_TREE : type, - t, CLASSTYPE_DECL_LIST (type)); + if (CLASSTYPE_TEMPLATE_INFO (type) + && TREE_CODE (t) != CONST_DECL) + { + tree purpose = friend_p ? NULL_TREE : type; + + CLASSTYPE_DECL_LIST (type) + = tree_cons (purpose, t, CLASSTYPE_DECL_LIST (type)); + } } /* This function is called from declare_virt_assop_and_dtor via