CWG2791 Unclear phrasing about "returning to the caller"

tkoeppe · Dec 17, 2023 · Nov 13, 2023 · Nov 13, 2023 · Nov 13, 2023 · Nov 13, 2023
commit 17cef3aebbc108ed8279b13ddbf054ecdef41d14
diff --git a/source/declarations.tex b/source/declarations.tex
@@ -6763,7 +6763,7 @@
 the \tcode{::operator new(size_t, nothrow_t)} form is used.
 The allocation function used in this case shall have a non-throwing
 \grammarterm{noexcept-specifier}.
-If the allocation function returns \keyword{nullptr}, the coroutine returns
+If the allocation function returns \keyword{nullptr}, the coroutine transfers
 control to the caller of the coroutine and the return value is obtained by a
 call to \tcode{T::get_return_object_on_allocation_failure()}, where \tcode{T}
 is the promise type.

diff --git a/source/expressions.tex b/source/expressions.tex
@@ -4747,6 +4747,8 @@
 The \keyword{co_await} expression is used to suspend evaluation of a
 coroutine\iref{dcl.fct.def.coroutine} while awaiting completion of
 the computation represented by the operand expression.
+Suspending the evaluation of a coroutine
+transfers control to its caller or resumer.
 
 \begin{bnf}
 \nontermdef{await-expression}\br

diff --git a/source/statements.tex b/source/statements.tex
@@ -846,7 +846,7 @@
 \indextext{function return|see{\tcode{return}}}%
 
 \pnum
-A function returns to its caller by the \tcode{return} statement.
+A function returns control to its caller by the \tcode{return} statement.
 
 \pnum
 The \grammarterm{expr-or-braced-init-list}
@@ -915,8 +915,8 @@
 \end{bnf}
 
 \pnum
-A coroutine returns to its caller or resumer\iref{dcl.fct.def.coroutine}
-by the \keyword{co_return} statement or when suspended\iref{expr.await}.
+A \keyword{co_return} statement transfers control to
+the caller or resumer of a coroutine\iref{dcl.fct.def.coroutine}.
 A coroutine shall not enclose
 a \tcode{return} statement\iref{stmt.return}.
 \begin{note}