diff options
| author | Adam Joseph <adam@westernsemico.com> | 2023-12-12T12·07-0800 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2023-12-12T17·03+0000 |
| commit | 7b9eea71d021315a1d29c2bcca84de72cc507e04 (patch) | |
| tree | fa10a913125466e17899d98e1b7c27781f7315b3 /tvix/eval | |
| parent | fc963033ae0f28a387d6aebcc1e827439f6653ef (diff) | |
fix(tvix/eval): fix nested assertions b/340 r/7190
This commit fixes our handling of `throw` within an `assert` condition. Fixes: b/340 Change-Id: I40a383639ec266da50a853f16216b1b7868495da Reviewed-on: https://cl.tvl.fyi/c/depot/+/10318 Autosubmit: Adam Joseph <adam@westernsemico.com> Tested-by: BuildkiteCI Reviewed-by: tazjin <tazjin@tvl.su>
Diffstat (limited to 'tvix/eval')
| -rw-r--r-- | tvix/eval/src/compiler/mod.rs | 2 | ||||
| -rw-r--r-- | tvix/eval/src/tests/tvix_tests/eval-okay-nested-assertions.exp (renamed from tvix/eval/src/tests/tvix_tests/notyetpassing/eval-okay-nested-assertions.exp) | 0 | ||||
| -rw-r--r-- | tvix/eval/src/tests/tvix_tests/eval-okay-nested-assertions.nix (renamed from tvix/eval/src/tests/tvix_tests/notyetpassing/eval-okay-nested-assertions.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 b6b5bc6860f9..831b92b67a11 100644 --- a/tvix/eval/src/compiler/mod.rs +++ b/tvix/eval/src/compiler/mod.rs @@ -836,6 +836,7 @@ impl Compiler<'_> { // Compile the assertion condition to leave its value on the stack. self.compile(slot, node.condition().unwrap()); self.emit_force(&node.condition().unwrap()); + let throw_idx = self.push_op(OpCode::OpJumpIfCatchable(JumpOffset(0)), node); let then_idx = self.push_op(OpCode::OpJumpIfFalse(JumpOffset(0)), node); self.push_op(OpCode::OpPop, node); @@ -848,6 +849,7 @@ impl Compiler<'_> { self.push_op(OpCode::OpAssertFail, &node.condition().unwrap()); self.patch_jump(else_idx); + self.patch_jump(throw_idx); } /// Compile conditional expressions using jumping instructions in the VM. diff --git a/tvix/eval/src/tests/tvix_tests/notyetpassing/eval-okay-nested-assertions.exp b/tvix/eval/src/tests/tvix_tests/eval-okay-nested-assertions.exp index c508d5366f70..c508d5366f70 100644 --- a/tvix/eval/src/tests/tvix_tests/notyetpassing/eval-okay-nested-assertions.exp +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-nested-assertions.exp diff --git a/tvix/eval/src/tests/tvix_tests/notyetpassing/eval-okay-nested-assertions.nix b/tvix/eval/src/tests/tvix_tests/eval-okay-nested-assertions.nix index b0397e268e41..b0397e268e41 100644 --- a/tvix/eval/src/tests/tvix_tests/notyetpassing/eval-okay-nested-assertions.nix +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-nested-assertions.nix |