+2021-10-03 Iain Sandoe <iain@sandoe.co.uk>
+
+ Backported from master:
+ 2021-09-28 Iain Sandoe <iain@sandoe.co.uk>
+
+ PR c++/102454
+ * coroutines.cc (analyze_fn_parms): Clean up synthetic names for
+ unnamed function params.
+ (morph_fn_to_coro): Do not try to set a guard variable for param
+ DTORs in the ramp, unless we have exceptions active.
+
+2021-10-03 Iain Sandoe <iain@sandoe.co.uk>
+
+ Backported from master:
+ 2021-09-14 Iain Sandoe <iain@sandoe.co.uk>
+
+ * coroutines.cc (struct param_info): Add copy_var.
+ (build_actor_fn): Use simplified param references.
+ (register_param_uses): Likewise.
+ (rewrite_param_uses): Likewise.
+ (analyze_fn_parms): New function.
+ (coro_rewrite_function_body): Add proxies for the fn
+ parameters to the outer bind scope of the rewritten code.
+ (morph_fn_to_coro): Use simplified version of param ref.
+
+2021-10-03 Iain Sandoe <iain@sandoe.co.uk>
+
+ Backported from master:
+ 2021-09-14 Iain Sandoe <iain@sandoe.co.uk>
+
+ * coroutines.cc (coro_resume_fn_id, coro_destroy_fn_id,
+ coro_promise_id, coro_frame_needs_free_id, coro_resume_index_id,
+ coro_self_handle_id, coro_actor_continue_id,
+ coro_frame_i_a_r_c_id): New.
+ (coro_init_identifiers): Initialize new name identifiers.
+ (coro_promise_type_found_p): Use pre-built identifiers.
+ (struct await_xform_data): Remove unused fields.
+ (transform_await_expr): Delete code that is now unused.
+ (build_actor_fn): Simplify interface, use pre-built identifiers and
+ remove transforms that are no longer needed.
+ (build_destroy_fn): Use revised field names.
+ (register_local_var_uses): Use pre-built identifiers.
+ (coro_rewrite_function_body): Simplify interface, use pre-built
+ identifiers. Generate proxy vars in the outer bind expr scope for the
+ implementation state that we wish to expose.
+ (morph_fn_to_coro): Adjust comments for new variable names, use pre-
+ built identifiers. Remove unused code to generate frame entries for
+ the implementation state. Adjust call for build_actor_fn.
+
+2021-10-03 Iain Sandoe <iain@sandoe.co.uk>
+
+ Backported from master:
+ 2021-09-03 Iain Sandoe <iain@sandoe.co.uk>
+
+ * coroutines.cc (register_local_var_uses): Do not mangle
+ frame entries for the outermost scope. Record the outer
+ scope as nesting depth 0.
+
+2021-10-03 Iain Sandoe <iain@sandoe.co.uk>
+
+ Backported from master:
+ 2021-09-03 Iain Sandoe <iain@sandoe.co.uk>
+
+ * coroutines.cc (coro_build_artificial_var): New.
+ (build_actor_fn): Use var builder, rename vars to use
+ implementation namespace.
+ (coro_rewrite_function_body): Likewise.
+ (morph_fn_to_coro): Likewise.
+
+2021-10-03 Iain Sandoe <iain@sandoe.co.uk>
+
+ Backported from master:
+ 2021-09-03 Iain Sandoe <iain@sandoe.co.uk>
+
+ * coroutines.cc (transform_local_var_uses): Record
+ frame offset expressions as DECL_VALUE_EXPRs instead of
+ rewriting them.
+
+2021-10-03 Iain Sandoe <iain@sandoe.co.uk>
+
+ Backported from master:
+ 2021-09-01 Iain Sandoe <iain@sandoe.co.uk>
+
+ * coroutines.cc (build_actor_fn): Add begin/finish clauses
+ to the initial test in the actor function.
+
+2021-10-03 Iain Sandoe <iain@sandoe.co.uk>
+
+ Backported from master:
+ 2021-09-01 Iain Sandoe <iain@sandoe.co.uk>
+
+ * coroutines.cc (await_statement_walker): Use build_stmt and
+ add_stmt instead of build1 and finish_expr_stmt.
+
+2021-10-03 Jason Merrill <jason@redhat.com>
+
+ Backported from master:
+ 2021-05-07 Jason Merrill <jason@redhat.com>
+
+ * coroutines.cc (build_co_await): Don't call 'rvalue'.
+ (flatten_await_stmt): Simplify initialization.
+ (morph_fn_to_coro): Change 'rvalue' to 'move'. Simplify.
+
2021-09-15 Jakub Jelinek <jakub@redhat.com>
Backported from master:
+2021-10-03 Harald Anlauf <anlauf@gmx.de>
+
+ Backported from master:
+ 2021-09-30 Harald Anlauf <anlauf@gmx.de>
+
+ PR fortran/102458
+ * gfortran.dg/pr102458b.f90: New test.
+
+2021-10-03 Harald Anlauf <anlauf@gmx.de>
+
+ Backported from master:
+ 2021-09-24 Harald Anlauf <anlauf@gmx.de>
+
+ PR fortran/102458
+ * gfortran.dg/pr102458.f90: New test.
+
+2021-10-03 Iain Sandoe <iain@sandoe.co.uk>
+
+ Backported from master:
+ 2021-09-28 Iain Sandoe <iain@sandoe.co.uk>
+
+ PR c++/102454
+ * g++.dg/coroutines/pr102454.C: New test.
+
+2021-10-03 Jason Merrill <jason@redhat.com>
+
+ Backported from master:
+ 2021-05-07 Jason Merrill <jason@redhat.com>
+
+ * g++.dg/coroutines/coro-bad-gro-00-class-gro-scalar-return.C:
+ Adjust diagnostic.
+
2021-09-30 Harald Anlauf <anlauf@gmx.de>
Backported from master: