From: Jason Merrill <jason@redhat.com>
Date: Wed, 23 Jan 2008 21:23:00 +0000 (-0500)
Subject: * pt.c (tsubst_aggr_type): Correct previous change.
X-Git-Tag: prereleases/gcc-4.2.3-rc1~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77ae0541198013236bdaee5658e3c613d149d7a3;p=thirdparty%2Fgcc.git

* pt.c (tsubst_aggr_type): Correct previous change.

From-SVN: r131764
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 7d02bb5b1e65..052522bd13d4 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-23  Jason Merrill  <jason@redhat.com>
+
+	* pt.c (tsubst_aggr_type): Correct previous change.
+
 2008-01-21  Jason Merrill  <jason@redhat.com>
 
 	PR c++/33959
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 9a6f2fc9cc69..3c301f2adaa3 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -6330,7 +6330,8 @@ tsubst_aggr_type (tree t,
 					  in_decl, /*entering_scope=*/1);
 	      /* If context is a nested class inside a class template,
 	         it may still need to be instantiated (c++/33959).  */
-	      complete_type (context);
+	      if (TYPE_P (context))
+		complete_type (context);
 	    }
 
 	  /* Then, figure out what arguments are appropriate for the