mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(tvix/eval): force functors before applying them

Browse source 
call_value in the VM expects the callable to be forced when calling
it, which was not the case for functors.

Change-Id: Id55a2fe32a9573be42aef8669e268df519a989cd
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7909
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
This commit is contained in:
Vincent Ambo 2023-01-23 16:35:33 +03:00 committed by tazjin
parent b5d1ae4722
commit d2f1a290a4
3 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
tvix/eval/src/tests/tvix_tests/eval-okay-thunked-functor.exp Normal file
View file

@ -0,0 +1 @@
42

7
tvix/eval/src/tests/tvix_tests/eval-okay-thunked-functor.nix Normal file
View file

@ -0,0 +1,7 @@
let
__functor = f;
f = self: x: self.out * x;
in {
inherit __functor;
out = 21;
} 2

4
tvix/eval/src/vm.rs
View file

@ -406,6 +406,10 @@ impl<'o> VM<'o> {
Value::Attrs(ref attrs) => match attrs.select("__functor") { Value::Attrs(ref attrs) => match attrs.select("__functor") {
None => Err(self.error(ErrorKind::NotCallable(callable.type_of()))), None => Err(self.error(ErrorKind::NotCallable(callable.type_of()))),
Some(functor) => { Some(functor) => {
if let Value::Thunk(thunk) = &functor {
fallible!(self, thunk.force(self));
}
// The functor receives the set itself as its first argument // The functor receives the set itself as its first argument
// and needs to be called with it. However, this call is // and needs to be called with it. However, this call is
// synthetic (i.e. there is no corresponding OpCall for the // synthetic (i.e. there is no corresponding OpCall for the