Skip to content

fix(rt): handle fun-type closure env refs in callee setup #956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Stevengre merged 2 commits into from
Mar 4, 2026
Merged

fix(rt): handle fun-type closure env refs in callee setup #956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e653715
fix(rt): recognize closure env refs in tuple-arg setup
Stevengre Mar 3, 2026
b46a5fe
test(integration): rename closure_access_struct and remove show
Stevengre Mar 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion kmir/src/kmir/kdist/mir-semantics/kmir.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,16 +581,22 @@ Therefore a heuristics is used here:
// or the closure ref type pointee is missing from the type table
andBool isRefType(lookupTy(tyOfLocal({LOCALS[CLOSURE]}:>TypedLocal)))
andBool isTy(pointeeTy(lookupTy(tyOfLocal({LOCALS[CLOSURE]}:>TypedLocal))))
andBool lookupTy({pointeeTy(lookupTy(tyOfLocal({LOCALS[CLOSURE]}:>TypedLocal)))}:>Ty) ==K typeInfoVoidType
andBool (
lookupTy({pointeeTy(lookupTy(tyOfLocal({LOCALS[CLOSURE]}:>TypedLocal)))}:>Ty) ==K typeInfoVoidType
orBool isFunType(lookupTy({pointeeTy(lookupTy(tyOfLocal({LOCALS[CLOSURE]}:>TypedLocal)))}:>Ty))
)
[priority(45), preserves-definedness]

syntax Bool ::= isTupleType ( TypeInfo ) [function, total]
| isRefType ( TypeInfo ) [function, total]
| isFunType ( TypeInfo ) [function, total]
// -------------------------------------------------------
rule isTupleType(typeInfoTupleType(_, _)) => true
rule isTupleType( _ ) => false [owise]
rule isRefType(typeInfoRefType(_)) => true
rule isRefType( _ ) => false [owise]
rule isFunType(typeInfoFunType(_)) => true
rule isFunType( _ ) => false [owise]

syntax KItem ::= #setTupleArgs ( Int , Value )
| #setTupleArgs ( Int , List )
Expand Down
0 ...ta/prove-rs/closure_access_struct-fail.rs → ...on/data/prove-rs/closure_access_struct.rs
View file
Open in desktop
File renamed without changes.
15 changes: 0 additions & 15 deletions kmir/src/tests/integration/data/prove-rs/show/closure_access_struct-fail.main.expected
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion kmir/src/tests/integration/test_integration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@
'ref-ptr-cast-elem-fail',
'ref-ptr-cast-elem-offset-fail',
'and_then_closure-fail',
'closure_access_struct-fail',
]


Expand Down