From: Jason Merrill <jason@redhat.com>
Date: Mon, 2 Mar 2020 19:42:47 +0000 (-0500)
Subject: c++: Fix return deduction of lambda in discarded stmt.
X-Git-Tag: releases/gcc-9.3.0~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e83a2d943a1affc8d945430b8feca290169fe3d7;p=thirdparty%2Fgcc.git

c++: Fix return deduction of lambda in discarded stmt.

A return statement in a discarded statement is not used for return type
deduction, but we still want to do deduction for a return statement in a
lambda in a discarded statement.

gcc/cp/ChangeLog
2020-03-02  Jason Merrill  <jason@redhat.com>

	PR c++/93442
	* parser.c (cp_parser_lambda_expression): Clear in_discarded_stmt.
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 2b134eed5723..bf1791d11a58 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2020-03-02  Jason Merrill  <jason@redhat.com>
+
+	PR c++/93442
+	* parser.c (cp_parser_lambda_expression): Clear in_discarded_stmt.
+
 2020-03-02  Jason Merrill  <jason@redhat.com>
 
 	PR c++/90732 - ICE with VLA capture and generic lambda.
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index d71d75e097a1..e1c02d7b7186 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -10453,6 +10453,10 @@ cp_parser_lambda_expression (cp_parser* parser)
     parser->implicit_template_scope = 0;
     parser->auto_is_implicit_function_template_parm_p = false;
 
+    /* The body of a lambda in a discarded statement is not discarded.  */
+    bool discarded = in_discarded_stmt;
+    in_discarded_stmt = 0;
+
     /* By virtue of defining a local class, a lambda expression has access to
        the private variables of enclosing classes.  */
 
@@ -10483,6 +10487,8 @@ cp_parser_lambda_expression (cp_parser* parser)
 
     type = finish_struct (type, /*attributes=*/NULL_TREE);
 
+    in_discarded_stmt = discarded;
+
     parser->num_template_parameter_lists = saved_num_template_parameter_lists;
     parser->in_statement = in_statement;
     parser->in_switch_statement_p = in_switch_statement_p;
diff --git a/gcc/testsuite/g++.dg/cpp1z/constexpr-if-lambda1.C b/gcc/testsuite/g++.dg/cpp1z/constexpr-if-lambda1.C
new file mode 100644
index 000000000000..64c4cd27fe61
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp1z/constexpr-if-lambda1.C
@@ -0,0 +1,16 @@
+// PR c++/93442
+// { dg-do compile { target c++17 } }
+
+struct bar {
+    int foo(){return 0;}
+};
+
+int foobar() {
+    if constexpr(true) {
+        return 0;
+    } else {
+        return [](){
+            return bar{};
+        }().foo();
+    }
+}