We can't resolve the call to foo<42> before instantiation of G, because the
template parameter of #1 has dependent type. But we were missing that in
our dependency check, because the tree walk of DECL_TEMPLATE_PARMS doesn't
look into the types of template parameters. So look at them directly.
Tested x86_64-pc-linux-gnu, applying to trunk.
gcc/cp/ChangeLog:
PR c++/93085
* pt.c (uses_outer_template_parms): Handle non-type and template
template parameters specifically.
gcc/testsuite/ChangeLog:
PR c++/93085
* g++.dg/template/dependent-tmpl1.C: New test.
---
gcc/cp/pt.c | 21 ++++++++++++++-----
.../g++.dg/template/dependent-tmpl1.C | 9 ++++++++
2 files changed, 25 insertions(+), 5 deletions(-)
create mode 100644 gcc/testsuite/g++.dg/template/dependent-tmpl1.C
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index abd1ad4d1a6..efcbc59f5c9 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -10846,11 +10846,22 @@ uses_outer_template_parms (tree decl)
&depth, NULL, /*include_nondeduced_p=*/true))
return true;
if (PRIMARY_TEMPLATE_P (decl)
- && for_each_template_parm (INNERMOST_TEMPLATE_PARMS
- (DECL_TEMPLATE_PARMS (decl)),
- template_parm_outer_level,
- &depth, NULL, /*include_nondeduced_p=*/true))
- return true;
+ || DECL_TEMPLATE_TEMPLATE_PARM_P (decl))
+ {
+ tree parms = INNERMOST_TEMPLATE_PARMS (DECL_TEMPLATE_PARMS (decl));
+ for (int i = TREE_VEC_LENGTH (parms) - 1; i >= 0; --i)
+ {
+ tree parm = TREE_VALUE (TREE_VEC_ELT (parms, i));
+ if (TREE_CODE (parm) == PARM_DECL
+ && for_each_template_parm (TREE_TYPE (parm),
+ template_parm_outer_level,
+ &depth, NULL, /*nondeduced*/true))
+ return true;
+ if (TREE_CODE (parm) == TEMPLATE_DECL
+ && uses_outer_template_parms (parm))
+ return true;
+ }
+ }
tree ci = get_constraints (decl);
if (ci)
ci = CI_ASSOCIATED_CONSTRAINTS (ci);
diff --git a/gcc/testsuite/g++.dg/template/dependent-tmpl1.C
b/gcc/testsuite/g++.dg/template/dependent-tmpl1.C
new file mode 100644
index 00000000000..7b800b6869a
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/dependent-tmpl1.C
@@ -0,0 +1,9 @@
+// PR c++/93085
+// { dg-do compile { target c++11 } }
+
+template<class T>
+struct G {
+ template<T> static int foo(); // #1
+ template<int> static int foo(); // #2
+ int x = foo<42>(); // OK
+};
base-commit: 7650259de8f86c403113f7186d82737eddb65ef6
--
2.27.0
