Support nested generic lambdas.

	* lambda.c (maybe_add_lambda_conv_op): Don't check for instantiated
	callop in the case of generic lambdas.

From-SVN: r202848

gcc/cp/ChangeLog

 2013-09-23  Adam Butcher  <adam@jessamine.co.uk>
 
+	* lambda.c (maybe_add_lambda_conv_op): Don't check for instantiated
+	callop in the case of generic lambdas.
+
+2013-09-23  Adam Butcher  <adam@jessamine.co.uk>
+
 	* parser.c (make_generic_type_name): Use global count rather than
 	parameter and ...
 	(add_implicit_template_parms): ... propagate interface change here.

gcc/cp/lambda.c

@@ -810,7 +810,7 @@ maybe_add_lambda_conv_op (tree type)
     = (DECL_TEMPLATE_INFO (callop)
     && DECL_TEMPLATE_RESULT (DECL_TI_TEMPLATE (callop)) == callop);
 
-  if (DECL_INITIAL (callop) == NULL_TREE)
+  if (!generic_lambda_p && DECL_INITIAL (callop) == NULL_TREE)
     {
       /* If the op() wasn't instantiated due to errors, give up.  */
       gcc_assert (errorcount || sorrycount);