re PR c++/28114 (ICE with struct definition in argument of template function)

	PR c++/28114
	* name-lookup.c (pushtag): Return if we have error_mark_node.

From-SVN: r114953

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 178b0af9cea7876be5d9418b58a65b0a7280aceb..5a3ac21e0cde42afde3c8fde8deaaf82a6ce65ae 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-23  Steve Ellcey  <sje@cup.hp.com>
+
+       PR c++/28114
+       * name-lookup.c (pushtag): Return if we have error_mark_node.
+
 2006-06-23  Steve Ellcey  <sje@cup.hp.com>
 
        PR c++/27019

diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c
index 3de99992a12b9640e6b67d4530e6843a9f3c79e5..0d195f9a3e8ced7e35fe4f27fe268bee3f285ef7 100644 (file)
--- a/gcc/cp/name-lookup.c
+++ b/gcc/cp/name-lookup.c
@@ -4872,7 +4872,11 @@ pushtag (tree name, tree type, tag_scope scope)
            pushdecl_class_level (decl);
        }
       else if (b->kind != sk_template_parms)
-       decl = pushdecl_with_scope (decl, b, /*is_friend=*/false);
+       {
+         decl = pushdecl_with_scope (decl, b, /*is_friend=*/false);
+         if (decl == error_mark_node)
+           POP_TIMEVAR_AND_RETURN (TV_NAME_LOOKUP, decl);
+       }
 
       TYPE_CONTEXT (type) = DECL_CONTEXT (decl);