diff options
| author | Jason Merrill <jason@redhat.com> | 2014-12-25 02:28:01 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2014-12-25 02:28:01 -0500 |
| commit | fdc2ae49fd456418639ebfea7d34ad7beda3c093 (patch) | |
| tree | dca5cf6b66e075778a790f779f7d532c0c4b6b89 /gcc/cp | |
| parent | 17e87c1ca5476117c64c69a9777226af70dd4394 (diff) | |
| download | gcc-fdc2ae49fd456418639ebfea7d34ad7beda3c093.zip gcc-fdc2ae49fd456418639ebfea7d34ad7beda3c093.tar.gz gcc-fdc2ae49fd456418639ebfea7d34ad7beda3c093.tar.bz2 | |
pt.c (check_default_tmpl_args): Uses the parameter source location in the diagnostic.
* pt.c (check_default_tmpl_args): Uses the parameter source
location in the diagnostic.
(convert_template_argument): Just return if parm is error_mark_node.
From-SVN: r219067
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 12 |
2 files changed, 9 insertions, 7 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 4eb8712..bd5dd49 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2014-12-25 Jason Merrill <jason@redhat.com> + * pt.c (check_default_tmpl_args): Uses the parameter source + location in the diagnostic. + (convert_template_argument): Just return if parm is error_mark_node. + PR c++/63522 * parser.c (cp_parser_type_parameter): Call check_for_bare_parameter_packs on default argument. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index f5bd842..21d0d3a 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -4578,13 +4578,8 @@ check_default_tmpl_args (tree decl, tree parms, bool is_primary, parameter pack, at the end of the template parameter list. */ - if (TREE_CODE (TREE_VALUE (parm)) == PARM_DECL) - error ("parameter pack %qE must be at the end of the" - " template parameter list", TREE_VALUE (parm)); - else - error ("parameter pack %qT must be at the end of the" - " template parameter list", - TREE_TYPE (TREE_VALUE (parm))); + error ("parameter pack %q+D must be at the end of the" + " template parameter list", TREE_VALUE (parm)); TREE_VALUE (TREE_VEC_ELT (inner_parms, i)) = error_mark_node; @@ -6524,6 +6519,9 @@ convert_template_argument (tree parm, tree val; int is_type, requires_type, is_tmpl_type, requires_tmpl_type; + if (parm == error_mark_node) + return error_mark_node; + if (TREE_CODE (arg) == TREE_LIST && TREE_CODE (TREE_VALUE (arg)) == OFFSET_REF) { |