(check_explicit_specialization): Don't mess with a returned

	error_mark_node.

From-SVN: r19949

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 2adb7c548033f122886916b6af306550b7b8b927..f0c33eae545b1453148b531b03409008aff2d4a2 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -6,6 +6,8 @@
        (tsubst_friend_function): Set lineno and input_filename so 
        error messages will be useful.
        (instantiate_template): Just return an error_mark_node.
+       (check_explicit_specialization): Don't mess with a returned
+       error_mark_node.
 
        * pt.c (print_template_context): Add new argument.
        (maybe_print_template_context): New fn.

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 2720f92eb2c010ba9e653750a9c3eafadd778ada..437a85d622ae7d86b3a9e6871dd3f3b8191099d3 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -1133,7 +1133,7 @@ check_explicit_specialization (declarator, decl, template_count, flags)
                                       member_specialization,
                                       1);
            
-      if (tmpl)
+      if (tmpl && tmpl != error_mark_node)
        {
          if (explicit_instantiation)
            {