diff options
| author | Jason Merrill <jason@redhat.com> | 2009-06-29 19:15:43 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2009-06-29 19:15:43 -0400 |
| commit | 8cc77ebed0974c51fe8e056a8321da1513121d67 (patch) | |
| tree | df1f82b537de0bf60e2f5c9bb1bd0c0f6d904db7 /gcc | |
| parent | b52b1749191efa8f23067b86acddd4450ddbd543 (diff) | |
| download | gcc-8cc77ebed0974c51fe8e056a8321da1513121d67.zip gcc-8cc77ebed0974c51fe8e056a8321da1513121d67.tar.gz gcc-8cc77ebed0974c51fe8e056a8321da1513121d67.tar.bz2 | |
re PR c++/40274 (Revision 145566 caused ICE in tsubst, at cp/pt.c:9289)
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.
From-SVN: r149066
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/cp/error.c | 11 |
2 files changed, 12 insertions, 6 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 80e55c1..dbca775 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +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. diff --git a/gcc/cp/error.c b/gcc/cp/error.c index 98dacb1..fa97a3b 100644 --- a/gcc/cp/error.c +++ b/gcc/cp/error.c @@ -165,7 +165,8 @@ dump_template_argument (tree arg, int flags) 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) @@ -184,7 +185,7 @@ count_non_default_template_args (tree args, tree params) 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; } @@ -1434,7 +1435,7 @@ dump_template_parms (tree info, int primary, int flags) 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; @@ -1443,11 +1444,9 @@ dump_template_parms (tree info, int primary, int flags) ? 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); |