From patchwork Fri Dec 2 19:01:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Palka X-Patchwork-Id: 61389 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id DE3893851893 for ; Fri, 2 Dec 2022 19:02:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DE3893851893 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1670007756; bh=2oYAxr9see8iKmNjuEgMne3jce1ZGDtEAoTWjiaOI5I=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=FiTzvRNQRN9x9ezEMh7aV/G34KU7hsH5y/dUZzq9ChRts5MCnWtD3jrIbn/gVBnyN liwUfSHHXCuhGORY+FR/BBAcpafePlQtY2nocrN8ZR0RuPIiqOOyyJVFMMaf8aLK2h C8oWQD91jnlinNMuxOaqVyxLkljbmcobPAbUSSNs= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 9533C385B1AA for ; Fri, 2 Dec 2022 19:01:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 9533C385B1AA Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-583-p2K1iWKpMn-kfEE-o-E_WQ-1; Fri, 02 Dec 2022 14:01:14 -0500 X-MC-Unique: p2K1iWKpMn-kfEE-o-E_WQ-1 Received: by mail-qt1-f199.google.com with SMTP id k1-20020ac84781000000b003a6894cdd5eso20565264qtq.14 for ; Fri, 02 Dec 2022 11:01:14 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=2oYAxr9see8iKmNjuEgMne3jce1ZGDtEAoTWjiaOI5I=; b=h00Zdg6xGkuXyalkYpzZ/DncWx8uCujUVR0poS3odFaDqGSFVvNxZiNR6URvEWLDJ/ FDTHkMYCfHDdS/LoIlkKkKwVDGqEy2MbFVLhGnTVWroZjY+ok1TTQTQips7SXDiMXgvQ MmSGHZD3fCsj6h70+6NODvPhxkA+0K4JswBD9WnbJ2bz3W472e70ydQtzOVvOJO1UoAd Rx/rOkwb1fhyl5rfmtiucPeLxVyW64MudlvUHj7INko3GxTQif+8NZwwCWfutZGDAAEl aJjvDQWzCSLhI4pM/XsdSAgbZw1TCZ1Unou8sfiDTP71cdN3Pzu9+/agzCWqp30/qdPZ lWPA== X-Gm-Message-State: ANoB5pnMfMB14ERXoC5VaJY/0qPUjBXmzLXhkBAKlAy51e3xW+gPnw0l JncIL6Qh6+jNCgMlX49B/xKsfB13QSSf8wJ/fFR6BzgA10OH7Mw3rc9E3AK67vrmGbaDZcjo0hL hCTeKdDGVcuD+zmLBOOCwp2SCVH89UWwQwSPysVhua6uyTnXWa3cwNAu6wG5Kojoe9T8= X-Received: by 2002:a05:6214:5787:b0:4bd:f2c3:c0ac with SMTP id lv7-20020a056214578700b004bdf2c3c0acmr49976161qvb.115.1670007672821; Fri, 02 Dec 2022 11:01:12 -0800 (PST) X-Google-Smtp-Source: AA0mqf5b4K593LylnA4AEaOD3MXCuzp5B8okGwocyf9WrfsHb784Hw7xfKavgWuiN6RutPdovfcZyQ== X-Received: by 2002:a05:6214:5787:b0:4bd:f2c3:c0ac with SMTP id lv7-20020a056214578700b004bdf2c3c0acmr49976118qvb.115.1670007672330; Fri, 02 Dec 2022 11:01:12 -0800 (PST) Received: from localhost.localdomain (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id g8-20020a05620a40c800b006f3e6933bacsm3008643qko.113.2022.12.02.11.01.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Dec 2022 11:01:11 -0800 (PST) To: gcc-patches@gcc.gnu.org Cc: jason@redhat.com, Patrick Palka Subject: [PATCH] c++: substituting CONST_DECL_USING_P enumerator [PR103081] Date: Fri, 2 Dec 2022 14:01:10 -0500 Message-Id: <20221202190110.3491914-1-ppalka@redhat.com> X-Mailer: git-send-email 2.39.0.rc0.49.g083e01275b MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-13.7 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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: , X-Patchwork-Original-From: Patrick Palka via Gcc-patches From: Patrick Palka Reply-To: Patrick Palka Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" We implement using enum at class scope by injecting clones of the enum's CONST_DECLs as fields of the class, for which CONST_DECL_USING_P is true, so that qualified lookup naturally finds the enumerators. Substitution into such a CONST_DECL currently ICEs however, because we assume the DECL_CONTEXT is always the ENUMERAL_TYPE (which has TYPE_VALUES) but in this case it's the RECORD_TYPE of the class scope (which has TYPE_FIELDS). Since these CONST_DECLs appear to always be non-dependent, this patch fixes this by shortcutting substitution for CONST_DECLs which have a non-dependent scope. This subsumes the existing (and seemingly dead) DECL_NAMESPACE_SCOPE_P early exit test and also benefits substitution into ordinary non-dependent CONST_DECLs. Bootstrapped and regtested on x86_64-pc-linu-xgnu, does this look OK for trunk/12? PR c++/103081 gcc/cp/ChangeLog: * pt.cc (tsubst_copy) : Generalize early exit test for namespace-scope decls to check dependence of the enclosing scope instead. Remove dead args early exit test. gcc/testsuite/ChangeLog: * g++.dg/cpp2a/using-enum-10.C: New test. * g++.dg/cpp2a/using-enum-10a.C: New test. --- gcc/cp/pt.cc | 7 +------ gcc/testsuite/g++.dg/cpp2a/using-enum-10.C | 16 ++++++++++++++++ gcc/testsuite/g++.dg/cpp2a/using-enum-10a.C | 18 ++++++++++++++++++ 3 files changed, 35 insertions(+), 6 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp2a/using-enum-10.C create mode 100644 gcc/testsuite/g++.dg/cpp2a/using-enum-10a.C diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index 31691618d1b..bc8ea06ceae 100644 --- a/gcc/cp/pt.cc +++ b/gcc/cp/pt.cc @@ -17066,13 +17066,8 @@ tsubst_copy (tree t, tree args, tsubst_flags_t complain, tree in_decl) if (DECL_TEMPLATE_PARM_P (t)) return tsubst_copy (DECL_INITIAL (t), args, complain, in_decl); - /* There is no need to substitute into namespace-scope - enumerators. */ - if (DECL_NAMESPACE_SCOPE_P (t)) + if (!uses_template_parms (DECL_CONTEXT (t))) return t; - /* If ARGS is NULL, then T is known to be non-dependent. */ - if (args == NULL_TREE) - return scalar_constant_value (t); /* Unfortunately, we cannot just call lookup_name here. Consider: diff --git a/gcc/testsuite/g++.dg/cpp2a/using-enum-10.C b/gcc/testsuite/g++.dg/cpp2a/using-enum-10.C new file mode 100644 index 00000000000..98fe0644729 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp2a/using-enum-10.C @@ -0,0 +1,16 @@ +// PR c++/103081 +// { dg-do compile { target c++20 } } + +enum class Pig { OINK }; + +struct Hog { + using enum Pig; + Hog(Pig) { } +}; + +template +void pen() { + Hog(Hog::OINK); +} + +template void pen<0>(); diff --git a/gcc/testsuite/g++.dg/cpp2a/using-enum-10a.C b/gcc/testsuite/g++.dg/cpp2a/using-enum-10a.C new file mode 100644 index 00000000000..43688e69b19 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp2a/using-enum-10a.C @@ -0,0 +1,18 @@ +// A version of using-enum-10.C where Hog is a template. +// PR c++/103081 +// { dg-do compile { target c++20 } } + +enum class Pig { OINK }; + +template +struct Hog { + using enum Pig; + Hog(Pig) { OINK; } +}; + +template +void pen() { + Hog(Hog::OINK); +} + +template void pen<0>();