cp:

	* decl.c (grokdeclarator): Diagnose undefined template contexts.
testsuite:
	* g++.old-deja/g++.pt/incomplete1.C: New test.

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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index fa09401..7f18e81 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2000-11-28  Nathan Sidwell  <nathan@codesourcery.com>
 
+       * decl.c (grokdeclarator): Diagnose undefined template contexts.
+
+2000-11-28  Nathan Sidwell  <nathan@codesourcery.com>
+
        * decl.c (grokdeclarator): Do type access control on friend
        class.
 

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index da74687..1c29bbf 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -10995,8 +10995,7 @@ grokdeclarator (declarator, declspecs, decl_context, initialized, attrlist)
                  }
                else if (TREE_CODE (type) == FUNCTION_TYPE)
                  {
-                   if (current_class_type == NULL_TREE
-                       || friendp)
+                   if (current_class_type == NULL_TREE || friendp)
                      type = build_cplus_method_type (ctype, TREE_TYPE (type),
                                                      TYPE_ARG_TYPES (type));
                    else
@@ -11022,18 +11021,11 @@ grokdeclarator (declarator, declspecs, decl_context, initialized, attrlist)
                      }
                    type = build_offset_type (ctype, type);
                  }
-               else if (uses_template_parms (ctype))
-                 {
-                    if (TREE_CODE (type) == FUNCTION_TYPE)
-                     type
-                       = build_cplus_method_type (ctype, TREE_TYPE (type),
-                                                  TYPE_ARG_TYPES (type));
-                 }
                else
-                 {
-                   cp_error ("structure `%T' not yet defined", ctype);
-                   return error_mark_node;
-                 }
+                 {
+                   incomplete_type_error (NULL_TREE, ctype);
+                   return error_mark_node;
+                 }
 
                declarator = sname;
              }

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 66e4723..f827bf0 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,9 @@
 2000-11-28  Nathan Sidwell  <nathan@codesourcery.com>
 
+       * g++.old-deja/g++.pt/incomplete1.C: New test.
+
+2000-11-28  Nathan Sidwell  <nathan@codesourcery.com>
+
        * g++.old-deja/g++.other/friend9.C: New test.
 
 2000-11-28  Jakub Jelinek  <jakub@redhat.com>

diff --git a/gcc/testsuite/g++.old-deja/g++.pt/incomplete1.C b/gcc/testsuite/g++.old-deja/g++.pt/incomplete1.C
new file mode 100644 (file)
index 0000000..c08e90c
--- /dev/null
+++ b/gcc/testsuite/g++.old-deja/g++.pt/incomplete1.C
@@ -0,0 +1,11 @@
+// Build don't link:
+
+// Copyright (C) 2000 Free Software Foundation, Inc.
+// Contributed by Nathan Sidwell 28 Nov 2000 <nathan@codesourcery.com>
+
+// Inspired by by 756. We'd ICE when trying to define a member of an
+// incomplete template type.
+
+template<class X> struct ObjCount;  // ERROR - forward decl
+
+template<class X> int ObjCount<X>::m; // ERROR - undefined type