fix(rt): repair closure callee setup for iter-eq repro#957
Merged
Conversation
This was referenced Feb 28, 2026
automergerpr-permission-manager bot
pushed a commit
to runtimeverification/stable-mir-json
that referenced
this pull request
Mar 2, 2026
#129) ### Summary - In `TyCollector::visit_ty` (`src/printer.rs`), after successful closure instance traversal, record closure `Ty` metadata in `types`. - Update integration golden files (`tests/integration/programs/*.smir.json.expected`) to match emitted closure `FunType` metadata. - Keep `Makefile` integration path as `TESTDIR=tests/integration/programs` to keep closure fixture output paths stable. ### Context In the closure arm of `TyCollector::visit_ty`, the code resolved and visited the closure instance but returned without inserting the closure `Ty` into `types`. Other type families were inserted; closures were the exception. This made downstream closure type lookup incomplete (notably for kmir proof paths that consume exported type metadata). Recording closure `Ty` closes that gap. Related split: static/vtable alloc fallback changes were moved out to [stable-mir-json#131](#131) so this PR stays focused on closure metadata. Dependency context: this PR is depended on by [mir-semantics#957](runtimeverification/mir-semantics#957).
Stevengre
force-pushed
the
jh/fix-closure-type-call-setup
branch
2 times, most recently
from
085f266 to
cf54fdd
Compare
Stevengre
force-pushed
the
jh/fix-closure-type-call-setup
branch
from
9ffa29f to
79f90e4
Compare
Stevengre
changed the base branch from
codex/base-pr957-red
to
codex/base-pr957-pr955-pr956
Stevengre
force-pushed
the
jh/fix-closure-type-call-setup
branch
2 times, most recently
from
761dbc0 to
1986fca
Compare
Stevengre
force-pushed
the
jh/fix-closure-type-call-setup
branch
from
24094d5 to
9605315
Compare
Stevengre
changed the base branch from
codex/base-pr957-pr955-pr956
to
codex/base-pr957-master-952-955
Stevengre
force-pushed
the
jh/fix-closure-type-call-setup
branch
from
9605315 to
372ae6f
Compare
Stevengre
changed the base branch from
codex/base-pr957-master-952-955
to
master
Stevengre
force-pushed
the
jh/fix-closure-type-call-setup
branch
from
372ae6f to
ba3fc56
Compare
Stevengre
changed the title
Stevengre
force-pushed
the
jh/fix-closure-type-call-setup
branch
from
ba3fc56 to
1da9552
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
iter-eq-copied-take-dereftruncateas a regressionsetupCalleeClosure2by initializing callee_1with the closure env before tuple unpacking#EndProgramWhy This Fix
1947steps the new repro stopped at:#traverseProjection(toLocal(1), thunk(operandCopy(place(... local: local(1) ...))))setupCalleeClosure2reservedNEWLOCALSand unpacked the tuple argument into_2.., but never wrote the closure receiver/env into_1. The std closure body later dereferencedlocal(1), so execution walked a bad projection path instead of the closure env.#incrementRef(getValue(LOCALS, CLOSURE))intolocal(1)before#setTupleArgs(2, ...).1947-step leaf to#EndProgramafter5601steps. The cleanup commit then deletes only the temporary show artifact.