* pt.c (tsubst_aggr_type): Check TYPE_P before tsubsting.

From-SVN: r178650

gcc/cp/ChangeLog

+2011-09-07  Jason Merrill  <jason@redhat.com>
+
+	* pt.c (tsubst_aggr_type): Check TYPE_P before tsubsting.
+
 2011-09-06  Jason Merrill  <jason@redhat.com>
 
 	PR c++/50296

gcc/cp/pt.c

@@ -9590,14 +9590,13 @@ tsubst_aggr_type (tree t,
 	  /* First, determine the context for the type we are looking
 	     up.  */
 	  context = TYPE_CONTEXT (t);
-	  if (context)
+	  if (context && TYPE_P (context))
 	    {
 	      context = tsubst_aggr_type (context, args, complain,
 					  in_decl, /*entering_scope=*/1);
 	      /* If context is a nested class inside a class template,
 	         it may still need to be instantiated (c++/33959).  */
-	      if (TYPE_P (context))
-		context = complete_type (context);
+	      context = complete_type (context);
 	    }
 
 	  /* Then, figure out what arguments are appropriate for the