From: Adam Butcher <adam@jessamine.co.uk>
Date: Mon, 23 Sep 2013 22:43:15 +0000 (+0100)
Subject: Support nested generic lambdas.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=162b25fa1b382102f85ecdd804f8635eaa6a43aa;p=gcc.git

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 7de3018ea70..c97cb4546b0 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+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
diff --git a/gcc/cp/lambda.c b/gcc/cp/lambda.c
index b04448b5487..2ffa7e01d78 100644
--- 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);