diff options
author | Vincent Ambo <mail@tazj.in> | 2022-08-11T11·56+0300 |
---|---|---|
committer | tazjin <tazjin@tvl.su> | 2022-08-26T09·02+0000 |
commit | 671915837aee2908431b1d1908352fc0ab9cd628 (patch) | |
tree | 51dbc9390b14a8b41079b6d19e13060da6927724 /tvix/eval/src/compiler.rs | |
parent | aaa994137a89ab9d37fb83091dc7d24937898491 (diff) |
fix(tvix/eval): add operation to assert boolean type r/4491
This operation is required because both sides of the logical operators are strictly evaluated by Nix, even if the resulting value is not used further. For example, in our implementation of `&&`, if the left-hand side is `true`, then the result of the expression is simply the right-hand side value. This value must be asserted to be a boolean for the semantics of the language to work correctly. Change-Id: I34f5364f2a444753fa1d8b0a1a2b2d9cdf7c6700 Reviewed-on: https://cl.tvl.fyi/c/depot/+/6157 Tested-by: BuildkiteCI Reviewed-by: sterni <sternenseemann@systemli.org> Reviewed-by: grfn <grfn@gws.fyi>
Diffstat (limited to 'tvix/eval/src/compiler.rs')
-rw-r--r-- | tvix/eval/src/compiler.rs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tvix/eval/src/compiler.rs b/tvix/eval/src/compiler.rs index 90a6155b6b62..1bfd765a07cd 100644 --- a/tvix/eval/src/compiler.rs +++ b/tvix/eval/src/compiler.rs @@ -350,6 +350,7 @@ impl Compiler { self.compile(node.rhs().unwrap())?; self.patch_jump(end_idx); + self.chunk.add_op(OpCode::OpAssertBool); Ok(()) } @@ -370,6 +371,7 @@ impl Compiler { self.chunk.add_op(OpCode::OpPop); self.compile(node.rhs().unwrap())?; self.patch_jump(end_idx); + self.chunk.add_op(OpCode::OpAssertBool); Ok(()) } @@ -390,6 +392,7 @@ impl Compiler { self.chunk.add_op(OpCode::OpPop); self.compile(node.rhs().unwrap())?; self.patch_jump(end_idx); + self.chunk.add_op(OpCode::OpAssertBool); Ok(()) } |