From 361be3ccb9097f4e7c5978c435ccaeddd958e466 Mon Sep 17 00:00:00 2001
From: Marek Polacek <polacek@redhat.com>
Date: Fri, 2 Aug 2019 13:29:05 +0000
Subject: [PATCH] PR c++/91230 - wrong error with __PRETTY_FUNCTION__ and
 generic lambda.

	* pt.c (value_dependent_expression_p): Consider __PRETTY_FUNCTION__
	inside a template function value-dependent.

	* g++.dg/cpp1y/lambda-generic-pretty1.C: New test.

From-SVN: r274010
---
 gcc/cp/ChangeLog                                |  9 +++++++++
 gcc/cp/pt.c                                     |  9 ++++++++-
 .../g++.dg/cpp1y/lambda-generic-pretty1.C       | 17 +++++++++++++++++
 3 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/g++.dg/cpp1y/lambda-generic-pretty1.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 8621f5733be5..4f04385b5906 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,12 @@
+2019-08-02  Marek Polacek  <polacek@redhat.com>
+
+	Backported from mainline
+	2019-08-02  Marek Polacek  <polacek@redhat.com>
+	
+	PR c++/91230 - wrong error with __PRETTY_FUNCTION__ and generic lambda.
+	* pt.c (value_dependent_expression_p): Consider __PRETTY_FUNCTION__
+	inside a template function value-dependent.
+
 2019-07-19  Jason Merrill  <jason@redhat.com>
 
 	PR c++/90098 - partial specialization and class non-type parms.
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 7069e2f3047e..a2a986b1db1b 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -25562,7 +25562,14 @@ value_dependent_expression_p (tree expression)
       if (DECL_HAS_VALUE_EXPR_P (expression))
 	{
 	  tree value_expr = DECL_VALUE_EXPR (expression);
-	  if (value_dependent_expression_p (value_expr))
+	  if (value_dependent_expression_p (value_expr)
+	      /* __PRETTY_FUNCTION__ inside a template function is dependent
+		 on the name of the function.  */
+	      || (DECL_PRETTY_FUNCTION_P (expression)
+		  /* It might be used in a template, but not a template
+		     function, in which case its DECL_VALUE_EXPR will be
+		     "top level".  */
+		  && value_expr == error_mark_node))
 	    return true;
 	}
       return false;
diff --git a/gcc/testsuite/g++.dg/cpp1y/lambda-generic-pretty1.C b/gcc/testsuite/g++.dg/cpp1y/lambda-generic-pretty1.C
new file mode 100644
index 000000000000..4d3246b909b6
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp1y/lambda-generic-pretty1.C
@@ -0,0 +1,17 @@
+// PR c++/91230
+// { dg-do compile { target c++14 } }
+
+struct StringWrapper {
+    const char* Value;
+};
+
+template <typename T>
+void f() {
+    [](auto) {
+        StringWrapper{__PRETTY_FUNCTION__};
+    };
+}
+
+int main() {
+    f<int>();
+}
-- 
2.47.2