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

fix(tvix/eval): force condition of an assert

Browse source 
Change-Id: I3ad2234e8a8e4280e498c6d7af8ea0733ed4c7ea
Reviewed-on: https://cl.tvl.fyi/c/depot/+/6699
Autosubmit: sterni <sternenseemann@systemli.org>
Reviewed-by: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
This commit is contained in:
sterni 2022-09-19 13:09:03 +02:00
parent e04ccc9354
commit 7506983ce2
3 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
tvix/eval/src/compiler/mod.rs
View file

@ -471,6 +471,7 @@ impl Compiler<'_> {
fn compile_assert(&mut self, slot: LocalIdx, node: ast::Assert) { fn compile_assert(&mut self, slot: LocalIdx, node: ast::Assert) {
// Compile the assertion condition to leave its value on the stack. // Compile the assertion condition to leave its value on the stack.
self.compile(slot, node.condition().unwrap()); self.compile(slot, node.condition().unwrap());
self.emit_force(&node.condition().unwrap());
self.push_op(OpCode::OpAssert, &node.condition().unwrap()); self.push_op(OpCode::OpAssert, &node.condition().unwrap());
// The runtime will abort evaluation at this point if the // The runtime will abort evaluation at this point if the

1
tvix/eval/src/tests/tvix_tests/eval-okay-assert-thunk-condition.exp Normal file
View file

@ -0,0 +1 @@
21

7
tvix/eval/src/tests/tvix_tests/eval-okay-assert-thunk-condition.nix Normal file
View file

@ -0,0 +1,7 @@
let
condition = x: y: x < y;
in
# The function application here will become a thunk which verifies that
# assert forces the condition expression correctly.
assert condition 21 42; 21