+2009-06-29 Jason Merrill <jason@redhat.com>
+
+ PR c++/40274
+ * error.c (dump_template_parms): Pass all args to
+ count_non_default_template_args.
+ (count_non_default_template_args): Pull out the inner ones.
+
2009-06-26 H.J. Lu <hongjiu.lu@intel.com>
* decl.c (duplicate_decls): Re-indent.
static int
count_non_default_template_args (tree args, tree params)
{
- int n = TREE_VEC_LENGTH (args);
+ tree inner_args = INNERMOST_TEMPLATE_ARGS (args);
+ int n = TREE_VEC_LENGTH (inner_args);
int last;
if (params == NULL_TREE || !flag_pretty_templates)
def = tsubst_copy_and_build (def, args, tf_none, NULL_TREE, false, true);
--processing_template_decl;
}
- if (!cp_tree_equal (TREE_VEC_ELT (args, last), def))
+ if (!cp_tree_equal (TREE_VEC_ELT (inner_args, last), def))
break;
}
pp_cxx_begin_template_argument_list (cxx_pp);
/* Be careful only to print things when we have them, so as not
- to crash producing error messages. */
+ to crash producing error messages. */
if (args && !primary)
{
int len, ix;
? DECL_INNERMOST_TEMPLATE_PARMS (TI_TEMPLATE (info))
: NULL_TREE);
- if (TMPL_ARGS_HAVE_MULTIPLE_LEVELS (args))
- args = TREE_VEC_ELT (args, TREE_VEC_LENGTH (args) - 1);
-
len = count_non_default_template_args (args, params);
+ args = INNERMOST_TEMPLATE_ARGS (args);
for (ix = 0; ix != len; ix++)
{
tree arg = TREE_VEC_ELT (args, ix);