about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAdam Joseph <adam@westernsemico.com>2023-12-12T12·22-0800
committerclbot <clbot@tvl.fyi>2023-12-12T17·04+0000
commitbb1e79e5d19a43beeebe8f858019131c57f99c65 (patch)
tree893ad0dc2ea8089afeb8aa3b01f306c6d3d613fd
parentbcc1ea85521ea99e03efb97bf397cd63ebc3398e (diff)
fix(tvix/eval): propagate catchables through `&&` r/7192
Change-Id: I7bb5ac1ef47b41c47269e64cee0e90eb64c6fcce
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10322
Autosubmit: Adam Joseph <adam@westernsemico.com>
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
-rw-r--r--tvix/eval/src/compiler/mod.rs2
-rw-r--r--tvix/eval/src/tests/tvix_tests/eval-okay-logical-and-catchable.exp1
-rw-r--r--tvix/eval/src/tests/tvix_tests/eval-okay-logical-and-catchable.nix1
3 files changed, 4 insertions, 0 deletions
diff --git a/tvix/eval/src/compiler/mod.rs b/tvix/eval/src/compiler/mod.rs
index 451fa44de7d1..f6d6ca7c06bc 100644
--- a/tvix/eval/src/compiler/mod.rs
+++ b/tvix/eval/src/compiler/mod.rs
@@ -546,6 +546,7 @@ impl Compiler<'_> {
         self.compile(slot, node.lhs().unwrap());
         self.emit_force(&node.lhs().unwrap());
 
+        let throw_idx = self.push_op(OpCode::OpJumpIfCatchable(JumpOffset(0)), node);
         // If this value is false, jump over the right-hand side - the
         // whole expression is false.
         let end_idx = self.push_op(OpCode::OpJumpIfFalse(JumpOffset(0)), node);
@@ -559,6 +560,7 @@ impl Compiler<'_> {
 
         self.patch_jump(end_idx);
         self.push_op(OpCode::OpAssertBool, node);
+        self.patch_jump(throw_idx);
     }
 
     fn compile_or(&mut self, slot: LocalIdx, node: &ast::BinOp) {
diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-logical-and-catchable.exp b/tvix/eval/src/tests/tvix_tests/eval-okay-logical-and-catchable.exp
new file mode 100644
index 000000000000..c508d5366f70
--- /dev/null
+++ b/tvix/eval/src/tests/tvix_tests/eval-okay-logical-and-catchable.exp
@@ -0,0 +1 @@
+false
diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-logical-and-catchable.nix b/tvix/eval/src/tests/tvix_tests/eval-okay-logical-and-catchable.nix
new file mode 100644
index 000000000000..f731f09241d8
--- /dev/null
+++ b/tvix/eval/src/tests/tvix_tests/eval-okay-logical-and-catchable.nix
@@ -0,0 +1 @@
+(builtins.tryEval (  (throw "fred") && (throw "jill") )).success