Commit 65b8d24
committed
fix(text-json): JsonNode is not copyable and DetachParent is not public (#1888)
Deletes JsonNode's four copy/move members and moves DetachParent to protected
with JsonArray/JsonObject as friends, closing three measured defects: a copy gave
a second container sharing the SAME children, each still reporting the ORIGINAL
as its parent (J08); assignment SLICED, rewriting parent_ on a node still stored
in a container (J09); and public DetachParent let one node sit in TWO containers
(J13).
A .NET JsonNode is a REFERENCE type, so there was never an object copy to
translate, and XObject already deleted all four -- this ends an asymmetry inside
the port rather than inventing a restriction. Measured: zero first-party
copy/assign sites, zero in both consumers.
THE HEADER'S OWN NOTE WAS WRONG AND THE REFERENCE CORRECTS IT. It claimed to
mirror "JsonNode.cs's internal DetachParent"; there is no DetachParent on
JsonNode.cs at all. .NET puts it on the CONTAINERS, private on each
(JsonObject.cs:316, JsonArray.IList.cs:231), body `item?.Parent = null`, with
Parent's setter internal. Protected-plus-friends is that reachability in C++.
Four pins inverted, and the fourth was not where the measurement said to look:
JsonNodeTeardownTests built its second container with
make_shared<JsonArray>(realOwner), a copy commented "shares children". A grep for
`X = *y` missed it; the compiler found it. Its real subject is #1886's `== this`
guard, so it is rewritten to reach that guard without a copy.
Three mutations. M1 (restore copy) and M3 (DetachParent public) caught at compile
time. M2 (restore move) is NOT CAUGHT and is reported as such: a proven
equivalence, measured with a probe. JsonNode is ABSTRACT, so
is_move_constructible_v is false whatever the declaration says, and
JsonArray/JsonObject have user-declared destructors (#1895) that suppress their
implicit moves, so move-constructibility falls back to the already-deleted copy.
The deletion is kept for intent and becomes load-bearing if a container drops
that destructor -- the header and the fixture's own site both say so.
It also finally writes the fixture #1894 could not: test/consumer/
text_json_node_lifetime_negative.cpp, named in #1894's acceptance criteria, which
recorded correctly that it "cannot be started, not merely should not be" because
no CCF-019 repair had outlawed any spelling. Fixture set 45/231 -> 46/236.
Downstream ticket #2396: zero sites in both consumers.
Gate: 17,585 run, 17,585 passed, 0 failed, 0 skipped across 38 executables (+0,
deliberately -- three pins became two and one case was added).
Build directory: build/ only, --parallel 2 throughout.1 parent 66f27f1 commit 65b8d24
8 files changed
Lines changed: 391 additions & 47 deletions
File tree
- docs
- modules/text-json
- include/System/Text/Json/Nodes
- tests/System/Text/Json
- Nodes
- test/consumer
Large diffs are not rendered by default.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
Lines changed: 48 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
36 | 36 | | |
37 | 37 | | |
38 | 38 | | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
39 | 67 | | |
40 | 68 | | |
41 | 69 | | |
| |||
64 | 92 | | |
65 | 93 | | |
66 | 94 | | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
67 | 115 | | |
68 | 116 | | |
69 | 117 | | |
| |||
72 | 120 | | |
73 | 121 | | |
74 | 122 | | |
75 | | - | |
76 | | - | |
77 | 123 | | |
78 | 124 | | |
79 | 125 | | |
| |||
Lines changed: 18 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
838 | 838 | | |
839 | 839 | | |
840 | 840 | | |
| 841 | + | |
| 842 | + | |
| 843 | + | |
| 844 | + | |
| 845 | + | |
841 | 846 | | |
842 | 847 | | |
843 | 848 | | |
| |||
979 | 984 | | |
980 | 985 | | |
981 | 986 | | |
982 | | - | |
983 | | - | |
984 | | - | |
985 | | - | |
986 | | - | |
| 987 | + | |
| 988 | + | |
| 989 | + | |
| 990 | + | |
| 991 | + | |
| 992 | + | |
| 993 | + | |
| 994 | + | |
| 995 | + | |
| 996 | + | |
| 997 | + | |
| 998 | + | |
| 999 | + | |
987 | 1000 | | |
988 | 1001 | | |
989 | 1002 | | |
| |||
Lines changed: 62 additions & 36 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
36 | 42 | | |
37 | 43 | | |
38 | 44 | | |
| |||
171 | 177 | | |
172 | 178 | | |
173 | 179 | | |
174 | | - | |
175 | | - | |
176 | | - | |
177 | | - | |
178 | | - | |
179 | | - | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
180 | 202 | | |
181 | 203 | | |
182 | 204 | | |
183 | 205 | | |
184 | 206 | | |
185 | 207 | | |
186 | | - | |
| 208 | + | |
| 209 | + | |
187 | 210 | | |
188 | 211 | | |
189 | 212 | | |
190 | 213 | | |
191 | 214 | | |
192 | 215 | | |
193 | 216 | | |
194 | | - | |
195 | | - | |
196 | | - | |
197 | | - | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
198 | 240 | | |
199 | 241 | | |
200 | 242 | | |
201 | | - | |
202 | | - | |
203 | | - | |
204 | | - | |
205 | | - | |
206 | | - | |
207 | | - | |
208 | | - | |
209 | | - | |
210 | | - | |
211 | | - | |
212 | | - | |
213 | | - | |
214 | | - | |
215 | | - | |
216 | | - | |
217 | | - | |
218 | | - | |
219 | | - | |
220 | | - | |
221 | | - | |
222 | | - | |
223 | | - | |
224 | | - | |
225 | | - | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
226 | 252 | | |
227 | 253 | | |
228 | 254 | | |
| |||
0 commit comments