@@ -5297,6 +5297,14 @@ redeclare_class_template (tree type, tree parms)
/* Update the new parameters, too; they'll be used as the
parameters for any members. */
TREE_PURPOSE (TREE_VEC_ELT (parms, i)) = tmpl_default;
+
+ /* Give each template template parm in this redeclaration a
+ DECL_CONTEXT of the template for which they are a parameter. */
+ if (TREE_CODE (parm) == TEMPLATE_DECL)
+ {
+ gcc_assert (DECL_CONTEXT (parm) == NULL_TREE);
+ DECL_CONTEXT (parm) = tmpl;
+ }
}
return true;
@@ -7749,9 +7757,20 @@ lookup_template_class_1 (tree d1, tree arglist, tree in_decl, tree context,
if (outer)
outer = TI_ARGS (get_template_info (DECL_TEMPLATE_RESULT (outer)));
else if (current_template_parms)
- /* This is an argument of the current template, so we haven't set
- DECL_CONTEXT yet. */
- outer = current_template_args ();
+ {
+ /* This is an argument of the current template, so we haven't set
+ DECL_CONTEXT yet. */
+ tree relevant_template_parms;
+
+ /* Parameter levels that are greater than the level of the given
+ template template parm are irrelevant. */
+ relevant_template_parms = current_template_parms;
+ while (TMPL_PARMS_DEPTH (relevant_template_parms)
+ != TEMPLATE_TYPE_LEVEL (TREE_TYPE (templ)))
+ relevant_template_parms = TREE_CHAIN (relevant_template_parms);
+
+ outer = template_parms_to_args (relevant_template_parms);
+ }
if (outer)
arglist = add_to_template_args (outer, arglist);
new file mode 100644
@@ -0,0 +1,44 @@
+// PR c++/66850
+// Each namespace contains an otherwise standalone test case, none of which
+// should cause an ICE.
+
+namespace X {
+ template <template <typename U, U> class> struct Sort;
+
+ template <template <typename U, U> class Comparator>
+ struct Sort
+ {
+ template <int I>
+ struct less_than
+ {
+ Comparator<int, I> a;
+ };
+ };
+}
+
+namespace Y {
+ template <typename C, C> struct integral_constant {};
+
+ template <typename T, template <typename U, U> class> struct Sort;
+
+ template <template <typename U, U> class Comparator>
+ struct Sort<int, Comparator>
+ {
+ template <int I> struct less_than:
+ integral_constant<bool, Comparator<int, I>::value> {};
+ };
+}
+
+namespace Z {
+ template <typename T, template <typename U, U> class> struct Sort;
+
+ template <template <typename U, U> class Comparator>
+ struct Sort<int, Comparator>
+ {
+ template <int I>
+ struct less_than
+ {
+ Comparator<int, I> a;
+ };
+ };
+}