* cp-tree.h (get_arglist_len_in_bytes): Remove.

	PR c++/9264
	* parser.c (cp_parser_elaborated_type_specifier): Handle erroneous
	typeame types more robustly.

	PR c++/9172
	* g++.dg/parse/typename1.C: New file.

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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 47dc6fa..4111b95 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,11 @@
+2003-01-12  Mark Mitchell  <mark@codesourcery.com>
+
+       * cp-tree.h (get_arglist_len_in_bytes): Remove.
+
+       PR c++/9264
+       * parser.c (cp_parser_elaborated_type_specifier): Handle erroneous
+       typeame types more robustly.
+
 2003-01-11  Phil Edwards  <pme@gcc.gnu.org>
 
        * parser.c:  Fix comment typos.

diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index a9d4f2b..313b124 100644 (file)
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -3581,7 +3581,6 @@ extern GTY(()) operator_name_info_t assignment_operator_name_info
 
 /* in call.c */
 extern bool check_dtor_name (tree, tree);
-extern int get_arglist_len_in_bytes            (tree);
 
 extern tree build_vfield_ref                   (tree, tree);
 extern tree build_scoped_method_call (tree, tree, tree, tree);

diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index acbfd11..21d5d21 100644 (file)
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -9012,10 +9012,14 @@ cp_parser_elaborated_type_specifier (parser, is_friend, is_declaration)
                              /*current_scope_valid_p=*/false);
   /* Look for the nested-name-specifier.  */
   if (tag_type == typename_type)
-    cp_parser_nested_name_specifier (parser,
-                                    /*typename_keyword_p=*/true,
-                                    /*check_dependency_p=*/true,
-                                    /*type_p=*/true);
+    {
+      if (cp_parser_nested_name_specifier (parser,
+                                          /*typename_keyword_p=*/true,
+                                          /*check_dependency_p=*/true,
+                                          /*type_p=*/true) 
+         == error_mark_node)
+       return error_mark_node;
+    }
   else
     /* Even though `typename' is not present, the proposed resolution
        to Core Issue 180 says that in `class A<T>::B', `B' should be

diff --git a/gcc/testsuite/g++.dg/parse/typename1.C b/gcc/testsuite/g++.dg/parse/typename1.C
new file mode 100644 (file)
index 0000000..2af84e3
--- /dev/null
+++ b/gcc/testsuite/g++.dg/parse/typename1.C
@@ -0,0 +1,5 @@
+template <class baz>
+struct bar
+{
+  typedef typename baz::typename rebind<int> foo; // { dg-error "" }
+};