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

fix(tvix/eval): fix testing catchables for inequality

Browse source 
Fixes b/347.

Change-Id: Icad0251884d4d8adcdf8d690b91385bf4896f9c8
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10294
Tested-by: BuildkiteCI
Autosubmit: Adam Joseph <adam@westernsemico.com>
Reviewed-by: tazjin <tazjin@tvl.su>
This commit is contained in:
Adam Joseph 2023-12-11 22:59:14 -08:00 committed by clbot
parent 1b2a1892cb
commit 663362f3df
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
tvix/eval/src/tests/tvix_tests/notyetpassing/eval-okay-catchable-in-inequality.exp → tvix/eval/src/tests/tvix_tests/eval-okay-catchable-in-inequality.exp
View file

0
tvix/eval/src/tests/tvix_tests/notyetpassing/eval-okay-catchable-in-inequality.nix → tvix/eval/src/tests/tvix_tests/eval-okay-catchable-in-inequality.nix
View file

9
tvix/eval/src/vm/mod.rs
View file

@ -675,8 +675,13 @@ impl<'o> VM<'o> {
} }
OpCode::OpInvert => { OpCode::OpInvert => {
let v = self.stack_pop().as_bool().with_span(&frame, self)?; let v = self.stack_pop();
self.stack.push(Value::Bool(!v)); if v.is_catchable() {
self.stack.push(v);
} else {
let v = v.as_bool().with_span(&frame, self)?;
self.stack.push(Value::Bool(!v));
}
} }
OpCode::OpList(Count(count)) => { OpCode::OpList(Count(count)) => {