From 289663cac4c1acd75ea850f1622ec8fee9eeff44 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Mon, 11 Dec 2023 22:48:31 -0800 Subject: fix(tvix/eval): handle catchables in attribute set updates Fixes b/346. Change-Id: I277121d2363e605ebe09651ed9440fe1bc126c8c Reviewed-on: https://cl.tvl.fyi/c/depot/+/10292 Tested-by: BuildkiteCI Autosubmit: Adam Joseph Reviewed-by: tazjin --- .../tvix_tests/eval-okay-catchable-in-update-attrs.exp | 1 + .../tvix_tests/eval-okay-catchable-in-update-attrs.nix | 1 + .../notyetpassing/eval-okay-catchable-in-update-attrs.exp | 1 - .../notyetpassing/eval-okay-catchable-in-update-attrs.nix | 1 - tvix/eval/src/vm/mod.rs | 15 +++++++++++---- 5 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 tvix/eval/src/tests/tvix_tests/eval-okay-catchable-in-update-attrs.exp create mode 100644 tvix/eval/src/tests/tvix_tests/eval-okay-catchable-in-update-attrs.nix delete mode 100644 tvix/eval/src/tests/tvix_tests/notyetpassing/eval-okay-catchable-in-update-attrs.exp delete mode 100644 tvix/eval/src/tests/tvix_tests/notyetpassing/eval-okay-catchable-in-update-attrs.nix (limited to 'tvix/eval/src') diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-catchable-in-update-attrs.exp b/tvix/eval/src/tests/tvix_tests/eval-okay-catchable-in-update-attrs.exp new file mode 100644 index 0000000000..c508d5366f --- /dev/null +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-catchable-in-update-attrs.exp @@ -0,0 +1 @@ +false diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-catchable-in-update-attrs.nix b/tvix/eval/src/tests/tvix_tests/eval-okay-catchable-in-update-attrs.nix new file mode 100644 index 0000000000..38a9169034 --- /dev/null +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-catchable-in-update-attrs.nix @@ -0,0 +1 @@ +(builtins.tryEval (throw "bob" // { })).success diff --git a/tvix/eval/src/tests/tvix_tests/notyetpassing/eval-okay-catchable-in-update-attrs.exp b/tvix/eval/src/tests/tvix_tests/notyetpassing/eval-okay-catchable-in-update-attrs.exp deleted file mode 100644 index c508d5366f..0000000000 --- a/tvix/eval/src/tests/tvix_tests/notyetpassing/eval-okay-catchable-in-update-attrs.exp +++ /dev/null @@ -1 +0,0 @@ -false diff --git a/tvix/eval/src/tests/tvix_tests/notyetpassing/eval-okay-catchable-in-update-attrs.nix b/tvix/eval/src/tests/tvix_tests/notyetpassing/eval-okay-catchable-in-update-attrs.nix deleted file mode 100644 index 38a9169034..0000000000 --- a/tvix/eval/src/tests/tvix_tests/notyetpassing/eval-okay-catchable-in-update-attrs.nix +++ /dev/null @@ -1 +0,0 @@ -(builtins.tryEval (throw "bob" // { })).success diff --git a/tvix/eval/src/vm/mod.rs b/tvix/eval/src/vm/mod.rs index 642b6317ca..312d1b8935 100644 --- a/tvix/eval/src/vm/mod.rs +++ b/tvix/eval/src/vm/mod.rs @@ -661,10 +661,17 @@ impl<'o> VM<'o> { OpCode::OpAttrs(Count(count)) => self.run_attrset(&frame, count)?, OpCode::OpAttrsUpdate => { - let rhs = self.stack_pop().to_attrs().with_span(&frame, self)?; - let lhs = self.stack_pop().to_attrs().with_span(&frame, self)?; - - self.stack.push(Value::attrs(lhs.update(*rhs))) + let rhs = self.stack_pop(); + let lhs = self.stack_pop(); + if lhs.is_catchable() { + self.stack.push(lhs); + } else if rhs.is_catchable() { + self.stack.push(rhs); + } else { + let rhs = rhs.to_attrs().with_span(&frame, self)?; + let lhs = lhs.to_attrs().with_span(&frame, self)?; + self.stack.push(Value::attrs(lhs.update(*rhs))) + } } OpCode::OpInvert => { -- cgit 1.4.1