C++ PATCH for c++/69392 (ICE with 'this' init-capture)

[Jason Merrill]

We're already handling capture of 'this' specially, but we need to do 
that in the case of init-capture as well.

Tested x86_64-pc-linux-gnu, applying to trunk.
commit 3d101d4f78d0940b54838695df35874d18f827d0
Author: Jason Merrill <ja...@redhat.com>
Date:   Thu Jan 21 16:45:42 2016 -0500
    	PR c++/69392
    	* lambda.c (lambda_capture_field_type): Handle 'this' specially
    	for init-capture, too.

diff --git a/gcc/cp/lambda.c b/gcc/cp/lambda.c
index 3b0ea18..93b192c 100644
--- a/gcc/cp/lambda.c
+++ b/gcc/cp/lambda.c
@@ -207,15 +207,8 @@ tree
 lambda_capture_field_type (tree expr, bool explicit_init_p)
 {
   tree type;
-  if (explicit_init_p)
-    {
-      type = make_auto ();
-      type = do_auto_deduction (type, expr, type);
-    }
-  else
-    type = non_reference (unlowered_expr_type (expr));
-  if (type_dependent_expression_p (expr)
-      && !is_this_parameter (tree_strip_nop_conversions (expr)))
+  bool is_this = is_this_parameter (tree_strip_nop_conversions (expr));
+  if (!is_this && type_dependent_expression_p (expr))
     {
       type = cxx_make_type (DECLTYPE_TYPE);
       DECLTYPE_TYPE_EXPR (type) = expr;
@@ -223,6 +216,13 @@ lambda_capture_field_type (tree expr, bool explicit_init_p)
       DECLTYPE_FOR_INIT_CAPTURE (type) = explicit_init_p;
       SET_TYPE_STRUCTURAL_EQUALITY (type);
     }
+  else if (!is_this && explicit_init_p)
+    {
+      type = make_auto ();
+      type = do_auto_deduction (type, expr, type);
+    }
+  else
+    type = non_reference (unlowered_expr_type (expr));
   return type;
 }
 
diff --git a/gcc/testsuite/g++.dg/cpp1y/lambda-init14.C b/gcc/testsuite/g++.dg/cpp1y/lambda-init14.C
new file mode 100644
index 0000000..f7fffc5
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp1y/lambda-init14.C
@@ -0,0 +1,19 @@
+// PR c++/69392
+// { dg-do compile { target c++14 } }
+
+template <typename T>
+class Foo {
+  public:
+    void foo(void) {}
+    auto getCallableFoo(void) {
+      return
+        [ptr = this]() { ptr->foo(); };
+    }
+};
+
+int main()
+{
+  Foo<int> f;
+  auto callable = f.getCallableFoo();
+  callable();
+}