From patchwork Tue Mar 14 22:10:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 66395 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 3B1C7385840A for ; Tue, 14 Mar 2023 22:10:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3B1C7385840A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1678831852; bh=nIsBeXhJQCiPN9YcWLlWExftbJs6w752wWkgus/9ONc=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=eGq2HbZoxIMSOhOZ7C+d2LOsS27yCJwykUFL5lGeQjrRQH5aEsBUC3qniFjzMYrbc iUjQhCRjettoAsOsB2jkzOr74cXDYnC7eIrpeyVLBToDbEemIaebKfA3N0ajb+qohU HQFW7poJW1tOlt69VTkqf4M5x7UWDMYQr7cNa1Mg= 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.133.124]) by sourceware.org (Postfix) with ESMTPS id 112943858D33 for ; Tue, 14 Mar 2023 22:10:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 112943858D33 Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-498-rwSrj34HO2Si3YNGtKh-aQ-1; Tue, 14 Mar 2023 18:10:23 -0400 X-MC-Unique: rwSrj34HO2Si3YNGtKh-aQ-1 Received: by mail-qk1-f199.google.com with SMTP id az31-20020a05620a171f00b00745746178e2so4616966qkb.6 for ; Tue, 14 Mar 2023 15:10:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678831822; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=nIsBeXhJQCiPN9YcWLlWExftbJs6w752wWkgus/9ONc=; b=niEh6X3htJs1jzKr1JE964ZHDx1/h85DvihJuDPwiMxauRZjQ+RSJu6d2z3LGn7yrd VVagRdRL/uT34YoRV5psXTxLm1KE3MarvuRcmRF5ci5CfWSbUSoO0+ymelHvwPH0okNh gAuo1MtvLm8h+F8ju6FyYu+9M7lIyPwDya/IF3KYqC1T9sODvy7UTs/CaGLGlw1kUcKm RcaDKl+PbTxP8Zphw8n0iaiK4n4ZQeOXkPVcoQ0fMOolB8jHuujeY03h9vDg0rWelkjV AzCYWhB65jLAnTds6UcqkJ0VxAsNTzhdgesiig5qcizknkhcz/bz1sCHs6s0Tq/yPG4C ypZQ== X-Gm-Message-State: AO0yUKViMULdgco0csQ/FsYUV3YpELrsPNEIZ/QlbSWIdcXjIMs5reTD X/nyCEwrtSb9MMfRTAzbbf/eBT7vYTlD/lbHWmRA5UNjXaIEi+kR96+eaeyFW834mVZH8KKU5jD z8K7rHS4kGIKuNuR/FZDsWLg7AWaJaqpZMdJspirl8Hjxmdz63HonDzKNYMS752Qmq5yFeJxCyg == X-Received: by 2002:ac8:7c56:0:b0:3c0:14ec:bfbf with SMTP id o22-20020ac87c56000000b003c014ecbfbfmr61051102qtv.25.1678831822710; Tue, 14 Mar 2023 15:10:22 -0700 (PDT) X-Google-Smtp-Source: AK7set+zVlyIF0zoSdkSsMurifBaa1XgmYO+j1xYxYko6CrInkichUwxPjoLLuFJxm6/l3LPda4biQ== X-Received: by 2002:ac8:7c56:0:b0:3c0:14ec:bfbf with SMTP id o22-20020ac87c56000000b003c014ecbfbfmr61051051qtv.25.1678831822246; Tue, 14 Mar 2023 15:10:22 -0700 (PDT) Received: from jason.cygnus.com (130-44-159-43.s15913.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [130.44.159.43]) by smtp.gmail.com with ESMTPSA id a134-20020ae9e88c000000b007425dade624sm2579146qkg.41.2023.03.14.15.10.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Mar 2023 15:10:21 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [pushed] c++: variable tmpl partial specialization [PR108468] Date: Tue, 14 Mar 2023 18:10:19 -0400 Message-Id: <20230314221019.463098-1-jason@redhat.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.6 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: Jason Merrill via Gcc-patches From: Jason Merrill Reply-To: Jason Merrill Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Tested x86_64-pc-linux-gnu, applying to trunk. -- 8< -- Generally we expect TPARMS_PRIMARY_TEMPLATE to be set, but sometimes it isn't for partial instantiations. This ought to be improved, but it's trivial to work around it in this case. PR c++/108468 gcc/cp/ChangeLog: * pt.cc (unify_pack_expansion): Check that TPARMS_PRIMARY_TEMPLATE is non-null. gcc/testsuite/ChangeLog: * g++.dg/cpp1y/var-templ78.C: New test. --- gcc/cp/pt.cc | 2 ++ gcc/testsuite/g++.dg/cpp1y/var-templ78.C | 12 ++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 gcc/testsuite/g++.dg/cpp1y/var-templ78.C base-commit: 2b204accd07a3185b58b1edc6e9b019472857a5d diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index 65341c40f97..c53d8e279c6 100644 --- a/gcc/cp/pt.cc +++ b/gcc/cp/pt.cc @@ -24148,6 +24148,8 @@ unify_pack_expansion (tree tparms, tree targs, tree packed_parms, arguments if it is not otherwise deduced. */ if (cxx_dialect >= cxx20 && TREE_VEC_LENGTH (new_args) < TREE_VEC_LENGTH (old_args) + /* FIXME This isn't set properly for partial instantiations. */ + && TPARMS_PRIMARY_TEMPLATE (tparms) && builtin_guide_p (TPARMS_PRIMARY_TEMPLATE (tparms))) TREE_VEC_LENGTH (old_args) = TREE_VEC_LENGTH (new_args); if (!comp_template_args (old_args, new_args, diff --git a/gcc/testsuite/g++.dg/cpp1y/var-templ78.C b/gcc/testsuite/g++.dg/cpp1y/var-templ78.C new file mode 100644 index 00000000000..48366c92775 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1y/var-templ78.C @@ -0,0 +1,12 @@ +// PR c++/108468 +// { dg-do compile { target c++14 } } + +template struct C { + template + static constexpr int x = 1; +}; + +template template +int C::x = 2; + +int y = C<0>::x;