6.5 KiB
p1-v2 — wave 1.5, ID-48 finding 9: gen_pipe.py's expect_trip accepted any SystemExit
0. The one-paragraph answer
Same defect as M-1 in gen_pipe_field_ownership.py (p1-v1.md §7.1), found again in the sibling
generator by the codex cross-family review (finding 9) and confirmed by execution
(wave1-codex-verify.md §9, including the exit-code-zero half). scripts/gen_pipe.py's
expect_trip (:1379) caught bare except SystemExit as trip and asked nothing about which one
or what code it carried, so replacing the flag-typo control's callback (:1424) with
sys.exit("unrelated parser failure") — or with a successful sys.exit(0) — still counted as
"tripped as expected", and the harness's own line ("9 negative-control trip(s), positive control
OK") stayed true. Fixed by mirroring the field-ownership generator's shape exactly, plus an R-16
meta-control. Only scripts/gen_pipe.py was touched. No C++ changed.
1. What changed
expect_trip(name, fn) -> expect_trip(name, because, fn, quiet=False):
- Catches
SystemExit, readstrip.code. - A trip counts only if
code != 0ANDbecause in str(code)— the guard's own message, not merely that something exited.becauseis required, not inferred. quiet=Truelets a caller probe an exit without it printing as a real control result (used by the R-16 meta-control below, so that meta-control cannot itself inflate the trip count).
Each of the nine controls in self_test() now carries its own because substring, read off the
actual guard it exercises (verified by running the unfixed generator and reading the real
messages, not guessed):
| # | control | because |
|---|---|---|
| 1 | struct member without F(...) | member(s) with no F(...) in PipeFields.def |
| 2 | F(...) that is not a member | F(...) name(s) that are not members |
| 3 | payload with no struct | struct not found |
| 4 | verb missing from FillPoints.def | GLFunctionsTable member(s) without a verb row |
| 5 | verb not a GLFunctionsTable member | verb(s) that are not GLFunctionsTable members |
| 6 | field row naming a non-accessor | is not an accessor in Coverage.def |
| 7 | emitted row naming a call that does not exist | which is not a call in PipeCalls.def |
| 8 | call flag not an MGPipeCallFlags enumerator | which is not an MGPipeCallFlags enumerator |
| 9 | kNone combined with a real flag | combines kNone with |
R-16 meta-control, added inside self_test() right after control #9 is appended (not one of
the nine — it runs expect_trip(..., quiet=True) directly and sys.exits by hand if either
probe is wrongly accepted, so it cannot inflate trips/len(controls)): using control #8's own
because (flag_typo_because), it asserts that swapping the real callback for
lambda: sys.exit("unrelated parser failure") is REJECTED, and separately that
lambda: sys.exit(0) is REJECTED. This is exactly the review's two perturbations (finding 9 /
wave1-codex-verify.md §9), reused as the permanent regression guard rather than thrown away.
2. The red-once line
Reverting expect_trip's body to the pre-fix shape (except SystemExit as trip: return 1,
signature otherwise kept) while leaving everything else untouched turns --self-test red: the
R-16 meta-control's first probe (the unrelated-diagnostic swap) is silently accepted by the
reverted function, and the meta-control's own sys.exit fires —
"expect_trip counted an UNRELATED SystemExit as the flag-typo guard's own trip - finding 9 / R-16 is back" — nonzero exit, confirmed with an if/else control-flow check (not $?, which this
WSL shell does not propagate reliably through a chained bash -lc '...; echo $?'; if cmd; then ... else ... fi was used throughout for every pass/fail check in this round). Restoring the fix
turns it back to green with no other change.
3. Self-test counts, before and after
gen_pipe.py --self-test: 9 negative-control trip(s), positive control OK before AND after — the printed count is unchanged text, because the fix changes what a trip means (the guard's own message, code != 0), not how many controls exist. The R-16 meta-control is deliberately outside that count, matching howgen_pipe_field_ownership.py's own harness control is not part of its "15 controls" total.gen_pipe.py --check: generated files unchanged —gen_pipe: generated files are up to date(harness-only change, zero generator-output diff, as required).gen_pipe_field_ownership.py --self-test: unaffected, still 15 negative-control trip(s), each asserted against its OWN message; harness control OK; positive control OK.gen_pipe_dirty_surface.py --self-test: unaffected, still 27 negative controls, all tripped; positive controls OK.
4. t1's CI step
.github/workflows/test.yml:2253 (The MGPipe generators' checks can still fail) runs
python3 scripts/gen_pipe.py --self-test and gates on its exit code alone — it does not grep or
pin the "9 negative-control trip(s)" string anywhere. No CI step or expected count needs to
change. (Not touched, per the iron rule that test.yml is t1's.)
5. G1 / C++
Not touched. Only scripts/gen_pipe.py changed (a harness-only diff: expect_trip's signature
and body, and the nine controls' because arguments plus the R-16 meta-control — no generator
OUTPUT changed, confirmed by --check above). No .inc file, no .def file, no C++ source
differs from ce53553c. No build was run; none was needed to establish this — --check's
byte-identical result is the stronger claim (it covers every generated file, not just the ones a
particular build happens to compile), and G1 (symbol_report.py) only has meaning against a
libMobileGL.so built from changed C++, of which there is none this round.
6. Step 0 / merge
git var GIT_COMMITTER_IDENT printed Swung0x48 <swung0x48@outlook.com> before the first commit
(ID-40 satisfied). p5/p1 was fast-forwarded from 3aa48bcc (wave-1 landing) to ce53553c
(feat/disaggregated, ID-44's baseline, wave-2's p5/b1 round 2 / ID-41+ID-42) with
git merge --no-edit feat/disaggregated — a clean fast-forward, 70 files touched by the merge,
none of them scripts/gen_pipe*.py.
7. Commit
7110cdb6 [Fix] (scripts): make gen_pipe.py's expect_trip require the tripped guard's own message and a non-zero exit code, with an R-16 meta-control that an unrelated SystemExit or sys.exit(0) cannot pass as a trip - the any-SystemExit defect fb70704e fixed in the field-ownership generator, confirmed still present here by codex review finding 9