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

From-SVN: r131764

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 7d02bb5b1e65f324ab31f46833212dc1d65004c8..052522bd13d41fc77d3b2d0940fc6d27b9ad223a 100644 (file)
--- 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 9a6f2fc9cc691050124a34558aa95d2aed75c3e2..3c301f2adaa334f97c0abd1862d1a440c6bd6786 100644 (file)
--- 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