From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2122) id 710FE395B468; Fri, 13 May 2022 17:40:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 710FE395B468 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 r9-10162] c++: alias template equivalence and cv-quals [PR100032] X-Act-Checkin: gcc X-Git-Author: Jason Merrill X-Git-Refname: refs/heads/releases/gcc-9 X-Git-Oldrev: 30a100abe48cebcdf3d685e856850d4192f05ad9 X-Git-Newrev: 945c2afcb390dd040510ee7a2dc996ad204031c5 Message-Id: <20220513174051.710FE395B468@sourceware.org> Date: Fri, 13 May 2022 17:40:51 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 May 2022 17:40:51 -0000 https://gcc.gnu.org/g:945c2afcb390dd040510ee7a2dc996ad204031c5 commit r9-10162-g945c2afcb390dd040510ee7a2dc996ad204031c5 Author: Jason Merrill Date: Tue Apr 13 14:49:29 2021 -0400 c++: alias template equivalence and cv-quals [PR100032] We also need to check that the cv-qualifiers are the same. gcc/cp/ChangeLog: PR c++/100032 * pt.c (get_underlying_template): Compare TYPE_QUALS. gcc/testsuite/ChangeLog: PR c++/100032 * g++.dg/cpp0x/alias-decl-equiv1.C: New test. Diff: --- gcc/cp/pt.c | 4 ++++ gcc/testsuite/g++.dg/cpp0x/alias-decl-equiv1.C | 13 +++++++++++++ 2 files changed, 17 insertions(+) diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 08909e2c863..568d5155ea3 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -6255,6 +6255,10 @@ get_underlying_template (tree tmpl) != num_innermost_template_parms (underlying))) break; + /* Does the alias add cv-quals? */ + if (TYPE_QUALS (TREE_TYPE (underlying)) != TYPE_QUALS (TREE_TYPE (tmpl))) + break; + tree alias_args = INNERMOST_TEMPLATE_ARGS (template_parms_to_args (DECL_TEMPLATE_PARMS (tmpl))); if (!comp_template_args (TI_ARGS (tinfo), alias_args)) diff --git a/gcc/testsuite/g++.dg/cpp0x/alias-decl-equiv1.C b/gcc/testsuite/g++.dg/cpp0x/alias-decl-equiv1.C new file mode 100644 index 00000000000..ae27c43bc0a --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/alias-decl-equiv1.C @@ -0,0 +1,13 @@ +// PR c++/100032 +// { dg-do compile { target c++11 } } + +template class> struct X { }; +template struct Y { }; +template using Z = const Y; + +template using W = Z; +using U = X; +using U = X; + +using T = X; +using T = X; // { dg-error "conflicting declaration" }