aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp/pt.c
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/cp/pt.c')
-rw-r--r--gcc/cp/pt.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index a365603..85a5ea5 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -490,7 +490,7 @@ add_to_template_args (tree args, tree extra_args)
int i;
int j;
- if (args == NULL_TREE)
+ if (args == NULL_TREE || extra_args == error_mark_node)
return extra_args;
extra_depth = TMPL_ARGS_DEPTH (extra_args);
@@ -5970,6 +5970,9 @@ coerce_template_parms (tree parms,
parameters. */
int variadic_p = 0;
+ if (args == error_mark_node)
+ return error_mark_node;
+
nparms = TREE_VEC_LENGTH (parms);
/* Determine if there are any parameter packs. */