CWG Poll 1: P3921R0 DR issues

source/basic.tex

@@ -3477,7 +3477,7 @@
 An object that is not a subobject of any other object is called a \defn{complete
 object}.
 If an object is created
-in storage associated with a member subobject or array element \placeholder{e}
+in storage associated with a subobject \placeholder{e}
 (which may or may not be within its lifetime),
 the created object
 is a subobject of \placeholder{e}'s containing object if
@@ -3487,8 +3487,12 @@
 \item
 the storage for the new object exactly overlays the storage location associated with \placeholder{e}, and
 \item
+\placeholder{e} is not a potentially-overlapping subobject, and
+\item
 the new object is of the same type as \placeholder{e} (ignoring cv-qualification).
 \end{itemize}
+In this case, \placeholder{e} and the created object are
+\defnadj{corresponding direct}{subobjects}{subobject}.
 
 \pnum
 \indextext{object!providing storage for}%
@@ -4013,22 +4017,24 @@
 \end{note}
 
 \pnum
-An object $o_1$ is \defn{transparently replaceable} by an object $o_2$ if
+An object $o_1$ is \defn{transparently replaceable} by an object $o_2$ if either
+\begin{itemize}
+\item
+$o_1$ and $o_2$ are complete objects for which:
 \begin{itemize}
+\item $o_1$ is not const,
 \item the storage that $o_2$ occupies exactly overlays
 the storage that $o_1$ occupied, and
-
 \item $o_1$ and $o_2$ are of the same type
-(ignoring the top-level cv-qualifiers), and
-
-\item $o_1$ is not a const, complete object, and
-
-\item neither $o_1$ nor $o_2$
-is a potentially-overlapping subobject\iref{intro.object}, and
+(ignoring the top-level cv-qualifiers), or
+\end{itemize}
 
-\item either $o_1$ and $o_2$ are both complete objects, or
-$o_1$ and $o_2$ are direct subobjects of objects $p_1$ and $p_2$, respectively,
-and $p_1$ is transparently replaceable by $p_2$.
+\item
+$o_1$ and $o_2$ are corresponding direct subobjects\iref{intro.object} for which:
+\begin{itemize}
+\item the complete object of $o_1$ is not const or
+\item $o_1$ is a mutable member subobject or subobject thereof.
+\end{itemize}
 \end{itemize}
 
 \pnum