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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 7de3018..c97cb45 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,10 @@
 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.

diff --git a/gcc/cp/lambda.c b/gcc/cp/lambda.c
index b04448b..2ffa7e0 100644 (file)
--- a/gcc/cp/lambda.c
+++ b/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);