From: Jason Merrill <jason@redhat.com>
Date: Tue, 27 Feb 2018 04:22:24 +0000 (-0500)
Subject: PR c++/84520 - ICE with generic lambda in NSDMI.
X-Git-Tag: releases/gcc-6.5.0~499
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f0cbb20fd3322d3810b6f7bcef0f1dddf54a7830;p=thirdparty%2Fgcc.git

PR c++/84520 - ICE with generic lambda in NSDMI.

	* lambda.c (lambda_expr_this_capture): Don't look for fake NSDMI
	'this' in a generic lambda instantiation.

From-SVN: r258027
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 9f396c338aef..89dcffcba2e5 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2018-02-26  Jason Merrill  <jason@redhat.com>
+
+	PR c++/84520 - ICE with generic lambda in NSDMI.
+	* lambda.c (lambda_expr_this_capture): Don't look for fake NSDMI
+	'this' in a generic lambda instantiation.
+
 2018-02-16  Jason Merrill  <jason@redhat.com>
 
 	PR c++/84151 - unnecessary volatile load with static member.
diff --git a/gcc/cp/lambda.c b/gcc/cp/lambda.c
index 91a5c1a0b087..ea15c26ae3ee 100644
--- a/gcc/cp/lambda.c
+++ b/gcc/cp/lambda.c
@@ -665,11 +665,14 @@ lambda_expr_this_capture (tree lambda, bool add_capture_p)
                                     lambda_stack);
 
 	  if (LAMBDA_EXPR_EXTRA_SCOPE (tlambda)
+	      && !COMPLETE_TYPE_P (LAMBDA_EXPR_CLOSURE (tlambda))
 	      && TREE_CODE (LAMBDA_EXPR_EXTRA_SCOPE (tlambda)) == FIELD_DECL)
 	    {
 	      /* In an NSDMI, we don't have a function to look up the decl in,
 		 but the fake 'this' pointer that we're using for parsing is
-		 in scope_chain.  */
+		 in scope_chain.  But if the closure is already complete, we're
+	         in an instantiation of a generic lambda, and the fake 'this'
+	         is gone.  */
 	      init = scope_chain->x_current_class_ptr;
 	      gcc_checking_assert
 		(init && (TREE_TYPE (TREE_TYPE (init))
diff --git a/gcc/testsuite/g++.dg/cpp1y/lambda-generic-nsdmi1.C b/gcc/testsuite/g++.dg/cpp1y/lambda-generic-nsdmi1.C
new file mode 100644
index 000000000000..89ce519d8120
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp1y/lambda-generic-nsdmi1.C
@@ -0,0 +1,8 @@
+// PR c++/84520
+// { dg-do compile { target c++14 } }
+
+struct A
+{
+  static void foo(int);
+  void (*f)(int) = [](auto i) { foo(i); };
+};