diff options
| author | Jason Merrill <jason@redhat.com> | 2021-04-13 14:49:29 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@redhat.com> | 2021-04-13 15:20:09 -0400 |
| commit | 34ec63f1b5c2a4d39aa3b13ade96bcd44e294066 (patch) | |
| tree | 73bd3ff8abed9b276ef7bbfae86fa76fdf8f49d3 | |
| parent | 4df918798b445e86305b63f86f5312a18e4017c5 (diff) | |
| download | gcc-34ec63f1b5c2a4d39aa3b13ade96bcd44e294066.zip gcc-34ec63f1b5c2a4d39aa3b13ade96bcd44e294066.tar.gz gcc-34ec63f1b5c2a4d39aa3b13ade96bcd44e294066.tar.bz2 | |
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.
| -rw-r--r-- | gcc/cp/pt.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/alias-decl-equiv1.C | 13 |
2 files changed, 17 insertions, 0 deletions
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 106dfe5..59df794 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -6584,6 +6584,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 (generic_targs_for (tmpl)); if (!comp_template_args (TI_ARGS (tinfo), alias_args)) break; 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 0000000..ae27c43 --- /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 <template<class> class> struct X { }; +template <class> struct Y { }; +template <class T> using Z = const Y<T>; + +template <class T> using W = Z<T>; +using U = X<Z>; +using U = X<W>; + +using T = X<Y>; +using T = X<Z>; // { dg-error "conflicting declaration" } |