From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2122) id 7C27E3858D20; Sat, 22 Apr 2023 00:22:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7C27E3858D20 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1682122956; bh=fhjuNNrHZejrlm7z4z5bjzAGSHw21Tg/s2CtmfUaaRM=; h=From:To:Subject:Date:From; b=YjCnfB3Y0VmEAsPngmWf7Pj008XYHcZeB1vv6J9xraZPvEyBPDKR2PNVCYI1LIgwz fC7Rkq4/Q5klFckGjyqHAR+BCUEJRr0PSdsYpFNlHztNgeq4ZgomUBG5Izb3gyltyi AhvliLt9nUpYeOvofR7dae1Zn1KGZ5XXfcvFROQw= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jason Merrill To: gcc-cvs@gcc.gnu.org Subject: [gcc r11-10640] c++: variable tmpl partial specialization [PR108468] X-Act-Checkin: gcc X-Git-Author: Jason Merrill X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: e2931a30ac57a21382f6d1afa6b16e1cedf159c1 X-Git-Newrev: 469881efc4ad365dce3db26dab7d33f95d36f92f Message-Id: <20230422002236.7C27E3858D20@sourceware.org> Date: Sat, 22 Apr 2023 00:22:36 +0000 (GMT) List-Id: https://gcc.gnu.org/g:469881efc4ad365dce3db26dab7d33f95d36f92f commit r11-10640-g469881efc4ad365dce3db26dab7d33f95d36f92f Author: Jason Merrill Date: Tue Mar 14 16:32:31 2023 -0400 c++: variable tmpl partial specialization [PR108468] 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.c (unify_pack_expansion): Check that TPARMS_PRIMARY_TEMPLATE is non-null. gcc/testsuite/ChangeLog: * g++.dg/cpp1y/var-templ78.C: New test. Diff: --- gcc/cp/pt.c | 2 ++ gcc/testsuite/g++.dg/cpp1y/var-templ78.C | 12 ++++++++++++ 2 files changed, 14 insertions(+) diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 588c46504b4..02a74bb3f49 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -23451,6 +23451,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;