From: Mark Mitchell <mark@markmitchell.com>
Date: Mon, 17 Aug 1998 09:07:26 +0000 (+0000)
Subject: pt.c (check_explicit_specialization): Don't abort on bogus explicit instantiations.
X-Git-Tag: prereleases/egcs-1.1-prerelease~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4217bb1376724442134b9d04debd21db1ee906f9;p=thirdparty%2Fgcc.git

pt.c (check_explicit_specialization): Don't abort on bogus explicit instantiations.

	* pt.c (check_explicit_specialization): Don't abort on bogus
	explicit instantiations.

From-SVN: r21780
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index ad847f4b8392..c0b985cdbe4a 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+1998-08-17  Mark Mitchell  <mark@markmitchell.com>
+
+	* pt.c (check_explicit_specialization): Don't abort on bogus
+	explicit instantiations.
+
 1998-08-14  Jason Merrill  <jason@yorick.cygnus.com>
 
 	* rtti.c (get_tinfo_fn): Don't mess with the context for now.
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 9c724314ccfa..5c65140cbe7b 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -1107,19 +1107,33 @@ check_explicit_specialization (declarator, decl, template_count, flags)
 
       if (ctype != NULL_TREE && TYPE_BEING_DEFINED (ctype))
 	{
-	  /* Since finish_struct_1 has not been called yet, we
-	     can't call lookup_fnfields.  We note that this
-	     template is a specialization, and proceed, letting
-	     finish_struct fix this up later.  */
-	  tree ti = perm_tree_cons (NULL_TREE, 
-				    TREE_OPERAND (declarator, 1),
-				    NULL_TREE);
-	  TI_PENDING_SPECIALIZATION_FLAG (ti) = 1;
-	  DECL_TEMPLATE_INFO (decl) = ti;
-	  /* This should not be an instantiation; explicit
-	     instantiation directives can only occur at the top
-	     level.  */
-	  my_friendly_assert (!explicit_instantiation, 0);
+	  if (!explicit_instantiation)
+	    {
+	      /* Since finish_struct_1 has not been called yet, we
+		 can't call lookup_fnfields.  We note that this
+		 template is a specialization, and proceed, letting
+		 finish_struct fix this up later.  */
+	      tree ti = perm_tree_cons (NULL_TREE, 
+					TREE_OPERAND (declarator, 1),
+					NULL_TREE);
+	      TI_PENDING_SPECIALIZATION_FLAG (ti) = 1;
+	      DECL_TEMPLATE_INFO (decl) = ti;
+	    }
+	  else
+	    /* It's not legal to write an explicit instantiation in
+	       class scope, e.g.:
+
+	         class C { template void f(); }
+
+	       This case is caught by the parser.  However, on
+	       something like:
+	       
+	         template class C { void f(); };
+
+	       (which is illegal) we can get here.  The error will be
+	       issued later.  */
+	    ;
+
 	  return decl;
 	}
       else if (ctype != NULL_TREE