public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r14-2433] c++: coercing variable template from current inst [PR110580]
@ 2023-07-11 14:06 Patrick Palka
0 siblings, 0 replies; only message in thread
From: Patrick Palka @ 2023-07-11 14:06 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:b76d71564925abcabe6f5ad61d904b23c682cdfb
commit r14-2433-gb76d71564925abcabe6f5ad61d904b23c682cdfb
Author: Patrick Palka <ppalka@redhat.com>
Date: Tue Jul 11 10:05:19 2023 -0400
c++: coercing variable template from current inst [PR110580]
Here during ahead of time coercion of the variable template-id v1<int>,
since we pass only the innermost arguments to coerce_template_parms (and
outer arguments are still dependent at this point), substitution of the
default template argument V=U just lowers U from level 2 to level 1 rather
than replacing it with int as expected. Thus after coercion we incorrectly
end up with (effectively) v1<int, T> instead of v1<int, int>.
Coercion of a class/alias template-id on the other hand always passes
all levels arguments, which avoids this issue. So this patch makes us
do the same for variable template-ids.
PR c++/110580
gcc/cp/ChangeLog:
* pt.cc (lookup_template_variable): Pass all levels of arguments
to coerce_template_parms, and use the parameters from the most
general template.
gcc/testsuite/ChangeLog:
* g++.dg/cpp1y/var-templ83.C: New test.
Diff:
---
gcc/cp/pt.cc | 4 +++-
gcc/testsuite/g++.dg/cpp1y/var-templ83.C | 16 ++++++++++++++++
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc
index 076f788281e..fa15b75b9c5 100644
--- a/gcc/cp/pt.cc
+++ b/gcc/cp/pt.cc
@@ -10345,7 +10345,9 @@ lookup_template_variable (tree templ, tree arglist, tsubst_flags_t complain)
if (flag_concepts && variable_concept_p (templ))
return build_concept_check (templ, arglist, tf_none);
- tree parms = DECL_INNERMOST_TEMPLATE_PARMS (templ);
+ tree gen_templ = most_general_template (templ);
+ tree parms = DECL_INNERMOST_TEMPLATE_PARMS (gen_templ);
+ arglist = add_outermost_template_args (templ, arglist);
arglist = coerce_template_parms (parms, arglist, templ, complain);
if (arglist == error_mark_node)
return error_mark_node;
diff --git a/gcc/testsuite/g++.dg/cpp1y/var-templ83.C b/gcc/testsuite/g++.dg/cpp1y/var-templ83.C
new file mode 100644
index 00000000000..f5268f258d7
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp1y/var-templ83.C
@@ -0,0 +1,16 @@
+// PR c++/110580
+// { dg-do compile { target c++14 } }
+
+template<class T>
+struct A {
+ template<typename U, typename V = U>
+ static constexpr bool v1 = __is_same(U, V);
+
+ template<typename U, typename V = T>
+ static constexpr bool v2 = !__is_same(U, V);
+
+ static_assert(v1<int>, "");
+ static_assert(v2<int>, "");
+};
+
+template struct A<char>;
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-07-11 14:06 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-07-11 14:06 [gcc r14-2433] c++: coercing variable template from current inst [PR110580] Patrick Palka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).