From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 82769 invoked by alias); 30 Jan 2020 20:53:11 -0000 Mailing-List: contact gcc-cvs-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-cvs-owner@gcc.gnu.org Received: (qmail 81957 invoked by uid 9071); 30 Jan 2020 20:52:52 -0000 Date: Thu, 30 Jan 2020 20:53:00 -0000 Message-ID: <20200130205252.81955.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Jakub Jelinek To: gcc-cvs@gcc.gnu.org Subject: [gcc(refs/vendors/redhat/heads/gcc-10-branch)] c++: Fix return deduction of lambda in discarded stmt. X-Act-Checkin: gcc X-Git-Author: Jason Merrill X-Git-Refname: refs/vendors/redhat/heads/gcc-10-branch X-Git-Oldrev: 25d62480c89d6db90a66ba69f6dbaa820a1ac90b X-Git-Newrev: a4b4b1e3ac9a2c97f7550024c3cc5aff52e0614c X-SW-Source: 2020-01/txt/msg04754.txt.bz2 https://gcc.gnu.org/g:a4b4b1e3ac9a2c97f7550024c3cc5aff52e0614c commit a4b4b1e3ac9a2c97f7550024c3cc5aff52e0614c Author: Jason Merrill Date: Tue Jan 28 16:06:33 2020 -0500 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. PR c++/93442 * parser.c (cp_parser_lambda_expression): Clear in_discarded_stmt. Diff: --- gcc/cp/ChangeLog | 3 +++ gcc/cp/parser.c | 6 ++++++ gcc/testsuite/g++.dg/cpp1z/constexpr-if-lambda1.C | 16 ++++++++++++++++ 3 files changed, 25 insertions(+) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 0a959bb..9392c85 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,8 @@ 2020-01-28 Jason Merrill + PR c++/93442 + * parser.c (cp_parser_lambda_expression): Clear in_discarded_stmt. + PR c++/93477 PR c++/91476 * decl2.c (copy_linkage): Do copy DECL_ONE_ONLY and DECL_WEAK. diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 72037ee..b832782 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -10530,6 +10530,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. */ @@ -10560,6 +10564,8 @@ cp_parser_lambda_expression (cp_parser* parser) 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 0000000..64c4cd2 --- /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(); + } +}