Commit 821c459
Merge main (OWN053, #386) into feat/ownir-v1-state-protocols
main gained the OWN053 orphaned-awaitable advisory (#386) after this branch was
cut. #386 was written against OwnIR v0; this branch moves the whole contract to
v1. The merged tree is one OwnIR v1 that carries both:
OWNIR_VERSION 1, LOWERED_VERSION 2
flow ops move, borrow_mut (this branch)
top level orphaned_awaitables[] (#386, additive, both strict doors)
advisory OWN053, two frozen families (#386)
Nothing of either side is dropped, and there is no dual-version reading.
Textual conflicts: three, all generated status documents
(docs/generated/p022-{coord-census,cp4-census,shadow-census}.md). Resolved by
regenerating them with their writer, not by picking a side.
The conflict that mattered did not conflict. Git merged
frontend/roslyn/OwnSharp.Extractor/Program.cs cleanly and left #386's new
envelope — the one that carries `orphaned_awaitables` — stamped
`ownir_version = 0`, between two envelopes stamped 1. A scan with an OWN053 site
would have produced facts the v1 core refuses at the door. The IR2 check in
tests/test_ownir.py did not see it: it read only the FIRST stamp in each
producer. It now reads every stamp (`[1, 0, 1]` fails it), and the envelope is
stamped 1.
#386's documents that mean "the current version" are migrated to it, stamp only:
tests/fixtures/verdicts/verdict_own053_orphaned_awaitable.facts.json and the
four H-29 documents under corpus/ownership-lab/h29 (promo-u and the three
malformed door inputs). Their recorded outputs are unchanged, byte for byte, on
both engines, and the merged extractor reproduces promo-u.facts.json exactly
from fx/Orphan.cs: five sites, lines 11/12/21/22/23.
Regenerated with the repository's writers: the validation ledger (294 + 50
controls = 344, the inputs now stamped by OWNIR_VERSION), the Layer 3 verdict
goldens (132 + 1 = 133 cases), the repro digests (135 + 1 = 136 documents) and
the generated status documents. The merge result differs from this branch's
previous head in exactly #386's 56 paths and from both parents in 20; no ledger
outside those moved.
T0: scripts/perf_baseline.py, the workload manifest, the three bindings, the T0
document and the merge-gate files are untouched by this merge. The harness
identity is still 1a26aa63fd5f, the value Amendment 1 recorded.
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>56 files changed
Lines changed: 2288 additions & 86 deletions
File tree
- corpus/ownership-lab/h29
- door
- fx
- promotion
- docs
- case-studies
- generated
- frontend/roslyn/OwnSharp.Extractor
- ownlang
- rust/crates
- own-bridge/src
- own-cli/src
- own-diagnostics/src
- own-ir/src
- spec
- tests
- fixtures
- cli_ownir
- repro
- verdicts
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| 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 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
0 commit comments