CWG2549 Implicitly moving the operand of a throw-expression in unevaluated contexts

Author: burblebee

source/expressions.tex

@@ -1608,30 +1608,26 @@
 
 \pnum
 An \defnadj{implicitly movable}{entity} is
-a variable of automatic storage duration
+a variable with automatic storage duration
 that is either a non-volatile object or
 an rvalue reference to a non-volatile object type.
-In the following contexts,
-an \grammarterm{id-expression} is \defn{move-eligible}:
+An \grammarterm{id-expression} is \defn{move-eligible} if
 \begin{itemize}
 \item
-If the \grammarterm{id-expression} (possibly parenthesized)
-is the operand of a \tcode{return}\iref{stmt.return} or
-\keyword{co_return}\iref{stmt.return.coroutine} statement,
-and names an implicitly movable entity declared in the body
-or \grammarterm{parameter-declaration-clause} of the innermost enclosing
-function or \grammarterm{lambda-expression}, or
-\item
-if the \grammarterm{id-expression} (possibly parenthesized)
-is the operand of a \grammarterm{throw-expression}\iref{expr.throw},
-and names an implicitly movable entity
-that belongs to a scope that does not contain the \grammarterm{compound-statement}
-of the innermost
-\grammarterm{lambda-expression},
-\grammarterm{try-block}, or
-\grammarterm{function-try-block} (if any)
-whose \grammarterm{compound-statement} or \grammarterm{ctor-initializer}
-contains the \grammarterm{throw-expression}.
+it names an implicitly movable entity,
+\item
+it is the (possibly parenthesized)
+operand of a \tcode{return}\iref{stmt.return} or
+\keyword{co_return}\iref{stmt.return.coroutine} statement or
+of a \grammarterm{throw-expression}\iref{expr.throw}, and
+\item
+each intervening scope between
+the declaration of the entity and
+the innermost enclosing scope of the \grammarterm{id-expression}
+is a block scope and,
+for a \grammarterm{throw-expression},
+is not the block scope of
+a \grammarterm{try-block} or \grammarterm{function-try-block}.
 \end{itemize}
 
 \rSec3[expr.prim.id.qual]{Qualified names}