aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/decl.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 076f539..b702409 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-22 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net>
+
+ * decl.c (start_decl): Exit if push_template_decl returns
+ error_mark_node.
+
2003-10-20 Kazu Hirata <kazu@cs.umass.edu>
* ChangeLog: Fix typos.
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 32fe398..7b27feb 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -3788,6 +3788,8 @@ start_decl (tree declarator,
if (processing_template_decl)
tem = push_template_decl (tem);
+ if (tem == error_mark_node)
+ return error_mark_node;
#if ! defined (ASM_OUTPUT_BSS) && ! defined (ASM_OUTPUT_ALIGNED_BSS)
/* Tell the back-end to use or not use .common as appropriate. If we say