CWG2699 Inconsistency of throw-expression specification

Author: burblebee

source/expressions.tex

@@ -7082,19 +7082,24 @@
 A \grammarterm{throw-expression} is of type \keyword{void}.
 
 \pnum
-Evaluating a \grammarterm{throw-expression} with an operand throws an
-exception\iref{except.throw}; the type of the exception object is determined by removing
-any top-level \grammarterm{cv-qualifier}{s} from the static type of the
-operand and adjusting the type
-from ``array of \tcode{T}'' or function type \tcode{T}
-to ``pointer to \tcode{T}''.
+A \grammarterm{throw-expression} with an operand throws an
+exception\iref{except.throw}.
+The array-to-pointer\iref{conv.array} and function-to-pointer\iref{conv.func}
+standard conversions are performed on the operand.
+The type of the exception object is determined by removing
+any top-level \grammarterm{cv-qualifier}{s} from the type of the
+(possibly converted) operand.
 
 \pnum
 \indextext{exception handling!rethrow}%
 A
 \grammarterm{throw-expression}
 with no operand rethrows the currently handled exception\iref{except.handle}.
-The exception is reactivated with the existing exception object;
+\indextext{exception handling!terminate called@\tcode{terminate} called}%
+\indextext{\idxcode{terminate}!called}%
+If no exception is presently being handled,
+the function \tcode{std::terminate} is invoked\iref{except.terminate}.
+Otherwise, the exception is reactivated with the existing exception object;
 no new exception object is created.
 The exception is no longer considered to be caught.
 \begin{example}
@@ -7110,16 +7115,6 @@
 \end{codeblock}
 \end{example}
 
-\pnum
-\indextext{exception handling!rethrow}%
-\indextext{exception handling!terminate called@\tcode{terminate} called}%
-\indextext{\idxcode{terminate}!called}%
-If no exception is presently being handled,
-evaluating a
-\grammarterm{throw-expression}
-with no operand calls
-\tcode{std::\brk{}terminate()}\iref{except.terminate}.
-
 \rSec2[expr.ass]{Assignment and compound assignment operators}%
 \indextext{expression!assignment and compound assignment}