re PR c++/53783 (lambda in lambda in template function rejected)

	PR c++/53783
	* pt.c (tsubst_copy_and_build) [LAMBDA_EXPR]: Use tsubst
	for LAMBDA_EXPR_EXTRA_SCOPE.

From-SVN: r189190

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index e09166b59cf19714301e48c21ab93b9ef0bbbc7b..580f8cda3abbd7683f3cb16cc452cb3745a63289 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2012-07-02  Jason Merrill  <jason@redhat.com>
 
+       PR c++/53783
+       * pt.c (tsubst_copy_and_build) [LAMBDA_EXPR]: Use tsubst
+       for LAMBDA_EXPR_EXTRA_SCOPE.
+
        PR c++/53788
        * pt.c (build_non_dependent_expr): Don't wrap a dummy object.
 

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 563a1ad294f9355ce9b0fa5a4a16526197bed5f7..d385ea7ee76c113d146c096fc8847607bd5f432b 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -14401,7 +14401,7 @@ tsubst_copy_and_build (tree t,
        LAMBDA_EXPR_DISCRIMINATOR (r)
          = (LAMBDA_EXPR_DISCRIMINATOR (t));
        LAMBDA_EXPR_EXTRA_SCOPE (r)
-         = RECUR (LAMBDA_EXPR_EXTRA_SCOPE (t));
+         = tsubst (LAMBDA_EXPR_EXTRA_SCOPE (t), args, complain, in_decl);
        LAMBDA_EXPR_RETURN_TYPE (r)
          = tsubst (LAMBDA_EXPR_RETURN_TYPE (t), args, complain, in_decl);
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 56b83e44eaa096f963aa46b46b088f9d5bdf056d..cb62b113a1aec3f22de96e8e450ca5fa74235329 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2012-07-02  Jason Merrill  <jason@redhat.com>
 
+       PR c++/53783
+       * g++.dg/cpp0x/lambda/lambda-template7.C: New.
+
        PR c++/53788
        * g++.dg/cpp0x/decltype39.C: New.
        * g++.dg/diagnostic/method1.C: Adjust.

diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-template7.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-template7.C
new file mode 100644 (file)
index 0000000..5b098d0
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-template7.C
@@ -0,0 +1,5 @@
+// PR c++/53783
+// { dg-do compile { target c++11 } }
+
+template <class T> void foo() { [] { [] {}; }; }
+int main() { foo<void>(); }