aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJason Merrill <jason@yorick.cygnus.com>1998-05-22 04:18:51 +0000
committerJason Merrill <jason@gcc.gnu.org>1998-05-22 00:18:51 -0400
commit82a7448c53924c93ecddda8d35cb4cbda824f10c (patch)
tree7f718484951737569880c177cf9f22cd9d59c97d /gcc
parentd7fe837368e6100b687daadd2439af7c54330816 (diff)
downloadgcc-82a7448c53924c93ecddda8d35cb4cbda824f10c.zip
gcc-82a7448c53924c93ecddda8d35cb4cbda824f10c.tar.gz
gcc-82a7448c53924c93ecddda8d35cb4cbda824f10c.tar.bz2
(check_explicit_specialization): Don't mess with a returned
error_mark_node. From-SVN: r19949
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog2
-rw-r--r--gcc/cp/pt.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 2adb7c5..f0c33ea 100644
--- 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 2720f92..437a85d 100644
--- 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)
{