tsubst_lambda_expr was producing a function with two blocks that claimed to
be the outermost block in the function body, one from the call to
start_lambda_function in tsubst_lambda_expr, and one from tsubsting the
block added by start_lambda_function when we first parsed the lambda. This
messed with the named return value optimization, which only works for
variables in the outermost block.
Tested x86_64-pc-linux-gnu, applying to trunk.
gcc/cp/ChangeLog:
PR c++/91217
* pt.c (tsubst_lambda_expr): Skip the body block from
DECL_SAVED_TREE.
gcc/testsuite/ChangeLog:
PR c++/91217
* g++.dg/opt/nrv20.C: New test.
---
gcc/cp/pt.c | 9 +++++++--
gcc/testsuite/g++.dg/opt/nrv20.C | 20 ++++++++++++++++++++
2 files changed, 27 insertions(+), 2 deletions(-)
create mode 100644 gcc/testsuite/g++.dg/opt/nrv20.C
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 68ee71397d0..2763aa15f1f 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -19433,8 +19433,13 @@ tsubst_lambda_expr (tree t, tree args, tsubst_flags_t
complain, tree in_decl)
the purposes of template argument deduction. */
complain = tf_warning_or_error;
- tsubst_expr (DECL_SAVED_TREE (oldfn), args, complain, r,
- /*constexpr*/false);
+ tree saved = DECL_SAVED_TREE (oldfn);
+ if (TREE_CODE (saved) == BIND_EXPR && BIND_EXPR_BODY_BLOCK (saved))
+ /* We already have a body block from start_lambda_function, we don't
+ need another to confuse NRV (91217). */
+ saved = BIND_EXPR_BODY (saved);
+
+ tsubst_expr (saved, args, complain, r, /*constexpr*/false);
finish_lambda_function (body);
diff --git a/gcc/testsuite/g++.dg/opt/nrv20.C b/gcc/testsuite/g++.dg/opt/nrv20.C
new file mode 100644
index 00000000000..ade0c28824a
--- /dev/null
+++ b/gcc/testsuite/g++.dg/opt/nrv20.C
@@ -0,0 +1,20 @@
+// PR c++/91217
+// { dg-do compile { target c++11 } }
+// { dg-additional-options -fdump-tree-gimple }
+// { dg-final { scan-tree-dump-not "<retval> = a" "gimple" } }
+
+struct A
+{
+ int ar[42];
+};
+
+template <class T>
+A f()
+{
+ return [] { A a; return a; }();
+}
+
+int main()
+{
+ f<int>();
+}
base-commit: 2a26351b598242c2fbce95d2a0baacce0084aec6
prerequisite-patch-id: ce32856d89f65f0543b5696d12c0de2014236a6e
prerequisite-patch-id: 2bf69397dfd35a530e9da35351b67c6fb9e8e8d4
--
2.27.0
