From 663362f3df5cc62218db8b443a77b2d78240092a Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Mon, 11 Dec 2023 22:59:14 -0800 Subject: fix(tvix/eval): fix testing catchables for inequality Fixes b/347. Change-Id: Icad0251884d4d8adcdf8d690b91385bf4896f9c8 Reviewed-on: https://cl.tvl.fyi/c/depot/+/10294 Tested-by: BuildkiteCI Autosubmit: Adam Joseph Reviewed-by: tazjin --- .../src/tests/tvix_tests/eval-okay-catchable-in-inequality.exp | 1 + .../src/tests/tvix_tests/eval-okay-catchable-in-inequality.nix | 1 + .../notyetpassing/eval-okay-catchable-in-inequality.exp | 1 - .../notyetpassing/eval-okay-catchable-in-inequality.nix | 1 - tvix/eval/src/vm/mod.rs | 9 +++++++-- 5 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 tvix/eval/src/tests/tvix_tests/eval-okay-catchable-in-inequality.exp create mode 100644 tvix/eval/src/tests/tvix_tests/eval-okay-catchable-in-inequality.nix delete mode 100644 tvix/eval/src/tests/tvix_tests/notyetpassing/eval-okay-catchable-in-inequality.exp delete mode 100644 tvix/eval/src/tests/tvix_tests/notyetpassing/eval-okay-catchable-in-inequality.nix (limited to 'tvix') diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-catchable-in-inequality.exp b/tvix/eval/src/tests/tvix_tests/eval-okay-catchable-in-inequality.exp new file mode 100644 index 0000000000..c508d5366f --- /dev/null +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-catchable-in-inequality.exp @@ -0,0 +1 @@ +false diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-catchable-in-inequality.nix b/tvix/eval/src/tests/tvix_tests/eval-okay-catchable-in-inequality.nix new file mode 100644 index 0000000000..93836bd8fe --- /dev/null +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-catchable-in-inequality.nix @@ -0,0 +1 @@ +(builtins.tryEval (throw "bob" != 3)).success diff --git a/tvix/eval/src/tests/tvix_tests/notyetpassing/eval-okay-catchable-in-inequality.exp b/tvix/eval/src/tests/tvix_tests/notyetpassing/eval-okay-catchable-in-inequality.exp deleted file mode 100644 index c508d5366f..0000000000 --- a/tvix/eval/src/tests/tvix_tests/notyetpassing/eval-okay-catchable-in-inequality.exp +++ /dev/null @@ -1 +0,0 @@ -false diff --git a/tvix/eval/src/tests/tvix_tests/notyetpassing/eval-okay-catchable-in-inequality.nix b/tvix/eval/src/tests/tvix_tests/notyetpassing/eval-okay-catchable-in-inequality.nix deleted file mode 100644 index 93836bd8fe..0000000000 --- a/tvix/eval/src/tests/tvix_tests/notyetpassing/eval-okay-catchable-in-inequality.nix +++ /dev/null @@ -1 +0,0 @@ -(builtins.tryEval (throw "bob" != 3)).success diff --git a/tvix/eval/src/vm/mod.rs b/tvix/eval/src/vm/mod.rs index 312d1b8935..3d3b47be23 100644 --- a/tvix/eval/src/vm/mod.rs +++ b/tvix/eval/src/vm/mod.rs @@ -675,8 +675,13 @@ impl<'o> VM<'o> { } OpCode::OpInvert => { - let v = self.stack_pop().as_bool().with_span(&frame, self)?; - self.stack.push(Value::Bool(!v)); + let v = self.stack_pop(); + if v.is_catchable() { + self.stack.push(v); + } else { + let v = v.as_bool().with_span(&frame, self)?; + self.stack.push(Value::Bool(!v)); + } } OpCode::OpList(Count(count)) => { -- cgit 1.4.1