about summary refs log tree commit diff
path: root/tvix/eval
diff options
context:
space:
mode:
authorAdam Joseph <adam@westernsemico.com>2023-12-12T06·41-0800
committerclbot <clbot@tvl.fyi>2023-12-12T15·47+0000
commitedf411a86cddecc953ef4be621ae527d5269a800 (patch)
tree031550394d2af011dacb0bb60d331b3529222c82 /tvix/eval
parent24ff74d3463fd85077acfb211b4b32677e18db6e (diff)
fix(tvix/eval): fix recovering from throws in implications r/7180
This fixes b/345.

Change-Id: Ic0d3b6ffacd2a5e0050d22354d08320b69a4fe13
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10290
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
Autosubmit: Adam Joseph <adam@westernsemico.com>
Diffstat (limited to 'tvix/eval')
-rw-r--r--tvix/eval/src/compiler/mod.rs2
-rw-r--r--tvix/eval/src/tests/tvix_tests/eval-okay-test-catchables-in-implications.exp (renamed from tvix/eval/src/tests/tvix_tests/notyetpassing/eval-okay-test-catchables-in-implications.exp)0
-rw-r--r--tvix/eval/src/tests/tvix_tests/eval-okay-test-catchables-in-implications.nix (renamed from tvix/eval/src/tests/tvix_tests/notyetpassing/eval-okay-test-catchables-in-implications.nix)0
3 files changed, 2 insertions, 0 deletions
diff --git a/tvix/eval/src/compiler/mod.rs b/tvix/eval/src/compiler/mod.rs
index 4edb5f204533..211fd079a047 100644
--- a/tvix/eval/src/compiler/mod.rs
+++ b/tvix/eval/src/compiler/mod.rs
@@ -593,6 +593,7 @@ impl Compiler<'_> {
         // Leave left-hand side value on the stack and invert it.
         self.compile(slot, node.lhs().unwrap());
         self.emit_force(&node.lhs().unwrap());
+        let throw_idx = self.push_op(OpCode::OpJumpIfCatchable(JumpOffset(0)), node);
         self.push_op(OpCode::OpInvert, node);
 
         // Exactly as `||` (because `a -> b` = `!a || b`).
@@ -603,6 +604,7 @@ impl Compiler<'_> {
 
         self.patch_jump(end_idx);
         self.push_op(OpCode::OpAssertBool, node);
+        self.patch_jump(throw_idx);
     }
 
     /// Compile list literals into equivalent bytecode. List
diff --git a/tvix/eval/src/tests/tvix_tests/notyetpassing/eval-okay-test-catchables-in-implications.exp b/tvix/eval/src/tests/tvix_tests/eval-okay-test-catchables-in-implications.exp
index c508d5366f70..c508d5366f70 100644
--- a/tvix/eval/src/tests/tvix_tests/notyetpassing/eval-okay-test-catchables-in-implications.exp
+++ b/tvix/eval/src/tests/tvix_tests/eval-okay-test-catchables-in-implications.exp
diff --git a/tvix/eval/src/tests/tvix_tests/notyetpassing/eval-okay-test-catchables-in-implications.nix b/tvix/eval/src/tests/tvix_tests/eval-okay-test-catchables-in-implications.nix
index 126738d88329..126738d88329 100644
--- a/tvix/eval/src/tests/tvix_tests/notyetpassing/eval-okay-test-catchables-in-implications.nix
+++ b/tvix/eval/src/tests/tvix_tests/eval-okay-test-catchables-in-implications.nix