about summary refs log tree commit diff
path: root/tvix/eval/src/compiler/mod.rs
diff options
context:
space:
mode:
authorAdam Joseph <adam@westernsemico.com>2023-12-12T05·17-0800
committerclbot <clbot@tvl.fyi>2023-12-12T14·55+0000
commit9792920f8cdec92aa2c650de8cfd0a85fa7dce52 (patch)
treebaa5eb473824dc67af8965ef7b7cd9d69f6231a3 /tvix/eval/src/compiler/mod.rs
parente54eeda0ff4b777899491e2a753481e9c73af7df (diff)
fix(tvix/eval): fix branching on catchable defaults (b/343) r/7178
This commit adds Opcode::OpJumpIfCatchable, which can be inserted
ahead of most VM operations which expect a boolean on the stack, in
order to handle catchables in branching position properly.

Other than remembering to patch the jump, no other changes should be
required.

This commit also fixes b/343 by emitting this new opcode when
compiling if-then-else.  There are probably other places where we
need to do the same thing.

Change-Id: I48de3010014c0bbeba15d34fc0d4800e0bb5a1ef
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10288
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
Autosubmit: Adam Joseph <adam@westernsemico.com>
Diffstat (limited to 'tvix/eval/src/compiler/mod.rs')
-rw-r--r--tvix/eval/src/compiler/mod.rs6
1 files changed, 6 insertions, 0 deletions
diff --git a/tvix/eval/src/compiler/mod.rs b/tvix/eval/src/compiler/mod.rs
index 01e07304bc3f..4edb5f204533 100644
--- a/tvix/eval/src/compiler/mod.rs
+++ b/tvix/eval/src/compiler/mod.rs
@@ -864,6 +864,10 @@ impl Compiler<'_> {
         self.compile(slot, node.condition().unwrap());
         self.emit_force(&node.condition().unwrap());
 
+        let throw_idx = self.push_op(
+            OpCode::OpJumpIfCatchable(JumpOffset(0)),
+            &node.condition().unwrap(),
+        );
         let then_idx = self.push_op(
             OpCode::OpJumpIfFalse(JumpOffset(0)),
             &node.condition().unwrap(),
@@ -879,6 +883,7 @@ impl Compiler<'_> {
         self.compile(slot, node.else_body().unwrap());
 
         self.patch_jump(else_idx); // patch jump *over* else body
+        self.patch_jump(throw_idx); // patch jump *over* else body
     }
 
     /// Compile `with` expressions by emitting instructions that
@@ -1328,6 +1333,7 @@ impl Compiler<'_> {
             OpCode::OpJump(n)
             | OpCode::OpJumpIfFalse(n)
             | OpCode::OpJumpIfTrue(n)
+            | OpCode::OpJumpIfCatchable(n)
             | OpCode::OpJumpIfNotFound(n)
             | OpCode::OpJumpIfNoFinaliseRequest(n) => {
                 *n = offset;