diff options
| author | Jason Merrill <jason@redhat.com> | 2016-06-21 14:19:13 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2016-06-21 14:19:13 -0400 |
| commit | 2befd3f722b21e47f238c61400955eb9e65ce782 (patch) | |
| tree | b2ca415533cd375bcd773bd499901ff83b30da51 | |
| parent | e547455bd62b59821c4ab9e900d7d0ff14fd69c8 (diff) | |
| download | gcc-2befd3f722b21e47f238c61400955eb9e65ce782.zip gcc-2befd3f722b21e47f238c61400955eb9e65ce782.tar.gz gcc-2befd3f722b21e47f238c61400955eb9e65ce782.tar.bz2 | |
Fix constraint satisfaction in uninstantiated template.
* constraint.cc (constraints_satisfied_p): Keep as many levels of
args as our template has levels of parms.
From-SVN: r237655
| -rw-r--r-- | gcc/cp/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/cp/constraint.cc | 6 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/concepts/memtmpl1.C | 15 |
3 files changed, 22 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index c8aa713..20e34d6 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,8 @@ 2016-06-21 Jason Merrill <jason@redhat.com> + * constraint.cc (constraints_satisfied_p): Keep as many levels of + args as our template has levels of parms. + * pt.c (template_parm_outer_level, uses_outer_template_parms): New. (type_dependent_expression_p): Use uses_outer_template_parms. diff --git a/gcc/cp/constraint.cc b/gcc/cp/constraint.cc index 5e42fa9..af7a593 100644 --- a/gcc/cp/constraint.cc +++ b/gcc/cp/constraint.cc @@ -2122,8 +2122,10 @@ constraints_satisfied_p (tree decl) tree args = NULL_TREE; if (tree ti = DECL_TEMPLATE_INFO (decl)) { - ci = get_constraints (TI_TEMPLATE (ti)); - args = INNERMOST_TEMPLATE_ARGS (TI_ARGS (ti)); + tree tmpl = TI_TEMPLATE (ti); + ci = get_constraints (tmpl); + int depth = TMPL_PARMS_DEPTH (DECL_TEMPLATE_PARMS (tmpl)); + args = get_innermost_template_args (TI_ARGS (ti), depth); } else { diff --git a/gcc/testsuite/g++.dg/concepts/memtmpl1.C b/gcc/testsuite/g++.dg/concepts/memtmpl1.C new file mode 100644 index 0000000..6f3d5a3 --- /dev/null +++ b/gcc/testsuite/g++.dg/concepts/memtmpl1.C @@ -0,0 +1,15 @@ +// { dg-options "-std=c++1z -fconcepts" } + +template <class T> +struct A { + template <class U> + requires sizeof(T) == 1 + static void f(U); + template <class U> + requires sizeof(T) == 2 + static void f(U); + void g() + { + f(42); + } +}; |