cp:

	PR c++/18981
	* parser.c (cp_parser_lookup_name): Remove unneeded TYPENAME_TYPE
	flag setting.
testsuite:
	PR 18981
	* g++.dg/template/typename9.C: New test.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@92184 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 120f9b9..a879f4e 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2004-12-15  Nathan Sidwell  <nathan@codesourcery.com>
+
+       PR c++/18981
+       * parser.c (cp_parser_lookup_name): Remove unneeded TYPENAME_TYPE
+       flag setting.
+
 2004-12-14  Mark Mitchell  <mark@codesourcery.com>
 
        PR c++/18738

diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 13578f0..dc650d4 100644 (file)
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -14190,10 +14190,6 @@ cp_parser_lookup_name (cp_parser *parser, tree name,
                 is dependent.  */
              type = make_typename_type (parser->scope, name, tag_type,
                                         /*complain=*/1);
-             if (tag_type == enum_type)
-               TYPENAME_IS_ENUM_P (type) = 1;
-             else if (tag_type != typename_type)
-               TYPENAME_IS_CLASS_P (type) = 1;
              decl = TYPE_NAME (type);
            }
          else if (is_template)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ec5facc..98a3af8 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-15  Nathan Sidwell  <nathan@codesourcery.com>
+
+       PR 18981
+       * g++.dg/template/typename9.C: New test.
+
 2004-12-14  Mark Mitchell  <mark@codesourcery.com>
 
        PR c++/18738

diff --git a/gcc/testsuite/g++.dg/template/typename9.C b/gcc/testsuite/g++.dg/template/typename9.C
new file mode 100644 (file)
index 0000000..5f6fb96
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/typename9.C
@@ -0,0 +1,15 @@
+// { dg-do compile }
+
+// Copyright (C) 2004 Free Software Foundation, Inc.
+// Contributed by Nathan Sidwell 14 Dec 2004 <nathan@codesourcery.com>
+
+// PR 18981. ICE
+// Origin:  Andreas Schwab <schwab@suse.de>
+
+template <class T> 
+struct tree { 
+  struct iterator; 
+  struct sibling_iterator { 
+    friend struct tree<T>::iterator; 
+  }; 
+};