Added check for FunType in setupCalleeClosure (#969)

#956 added handles `FunType` for closures instead of `VoidType` for that
come from [stable mir json
129](runtimeverification/stable-mir-json#129)
for `setupCalleeClosure2`. This PR adds the same thing to
`setupCalleeClosure`. (Fixes regressed proofs for P-Token)

- Added explicit `FnOnce` test `closure_fnonce_tuple_arg.rs`
- Fixed `and_then_closure.rs`

Author: dkcumming

kmir/src/kmir/kdist/mir-semantics/kmir.md

@@ -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(

kmir/src/tests/integration/data/crate-tests/two-crate-bin/crate2::main.expected

@@ -2,7 +2,7 @@
 ┌─ 1 (root, init)
 │   #execTerminator ( terminator ( ... kind: terminatorKindCall ( ... func: operandC
 │
-│  (740 steps)
+│  (737 steps)
 ├─ 3 (terminal)
 │   #EndProgram ~> .K
 │

…n/data/prove-rs/and_then_closure-fail.rs …ration/data/prove-rs/and_then_closure.rskmir/src/tests/integration/data/prove-rs/and_then_closure-fail.rs renamed to kmir/src/tests/integration/data/prove-rs/and_then_closure.rs kmir/src/tests/integration/data/prove-rs/and_then_closure-fail.rs renamed to kmir/src/tests/integration/data/prove-rs/and_then_closure.rs

@@ -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);
+}

kmir/src/tests/integration/data/prove-rs/closure_fnonce_tuple_arg.rs

@@ -62,7 +62,6 @@
     'test_offset_from-fail',
     'ref-ptr-cast-elem-fail',
     'ref-ptr-cast-elem-offset-fail',
-    'and_then_closure-fail',
 ]