Skip to content

Added check for FunType in setupCalleeClosure #969

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
automergerpr-permission-manager merged 5 commits into from
Mar 4, 2026
Merged

Added check for FunType in setupCalleeClosure #969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
df4b8d0
Added test for `setupCalleeClosure`
dkcumming Mar 4, 2026
bf53885
Added check for `FunType` in `setupCalleeClosure`
dkcumming Mar 4, 2026
9b790ee
Updated test to passing
dkcumming Mar 4, 2026
5c18cf5
Also fixed and_then_closure-fail.rs
dkcumming Mar 4, 2026
663ec06
Updated steps in two-crate-bin test
dkcumming 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
6 changes: 4 additions & 2 deletions 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 @@ -548,8 +548,10 @@ Therefore a heuristics is used here:
andBool isTypedValue(LOCALS[TUPLE])
andBool isTupleType(lookupTy(tyOfLocal({LOCALS[TUPLE]}:>TypedLocal)))
andBool isTypedLocal(LOCALS[CLOSURE])
andBool typeInfoVoidType ==K lookupTy(tyOfLocal({LOCALS[CLOSURE]}:>TypedLocal))
// either the closure ref type is missing from type table
andBool (
typeInfoVoidType ==K lookupTy(tyOfLocal({LOCALS[CLOSURE]}:>TypedLocal))
orBool isFunType(lookupTy(tyOfLocal({LOCALS[CLOSURE]}:>TypedLocal)))
)
[priority(40), preserves-definedness]

rule [setupCalleeClosure2]: <k> #setUpCalleeData(
Expand Down
2 changes: 1 addition & 1 deletion kmir/src/tests/integration/data/crate-tests/two-crate-bin/crate2::main.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
┌─ 1 (root, init)
│ #execTerminator ( terminator ( ... kind: terminatorKindCall ( ... func: operandC
│
│ (740 steps)
│ (737 steps)
├─ 3 (terminal)
│ #EndProgram ~> .K
│
Expand Down
0 ...on/data/prove-rs/and_then_closure-fail.rs → ...gration/data/prove-rs/and_then_closure.rs
View file
Open in desktop
File renamed without changes.
8 changes: 8 additions & 0 deletions kmir/src/tests/integration/data/prove-rs/closure_fnonce_tuple_arg.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
fn apply<F: FnOnce(u8, u8) -> u8>(f: F, a: u8, b: u8) -> u8 {
f(a, b)
}

fn main() {
let result = apply(|x, y| x + y, 10, 32);
assert_eq!(result, 42);
}
15 changes: 0 additions & 15 deletions kmir/src/tests/integration/data/prove-rs/show/and_then_closure-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 @@ -62,7 +62,6 @@
'test_offset_from-fail',
'ref-ptr-cast-elem-fail',
'ref-ptr-cast-elem-offset-fail',
'and_then_closure-fail',
]


Expand Down