From 2949ee08f10f11a79af9b90933022ea40039462a Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Tue, 12 Dec 2023 01:52:39 -0800 Subject: fix(tvix/eval): calling a catchable is catchable When attempting to call a Value, if it is a Value::Catchable we must not cause an uncatchable failure. This commit simply reuses the Value::Catchable as the result of attempting to call it. This is safe because nix is designed so that nix code cannot distinguish between different catchable failures -- they all look the same to the interpreted code. This fixes b/351. Change-Id: Ibf763a08753e541843626182ff59fdbf15ea2959 Reviewed-on: https://cl.tvl.fyi/c/depot/+/10300 Autosubmit: Adam Joseph Tested-by: BuildkiteCI Reviewed-by: tazjin --- tvix/eval/src/vm/mod.rs | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'tvix/eval/src/vm/mod.rs') diff --git a/tvix/eval/src/vm/mod.rs b/tvix/eval/src/vm/mod.rs index 3d3b47be23e3..d57bd21e44c7 100644 --- a/tvix/eval/src/vm/mod.rs +++ b/tvix/eval/src/vm/mod.rs @@ -1056,6 +1056,12 @@ impl<'o> VM<'o> { self.enqueue_generator("__functor call", span, |co| call_functor(co, val)); Ok(()) } + + val @ Value::Catchable(_) => { + self.stack.push(val); + Ok(()) + } + v => Err(ErrorKind::NotCallable(v.type_of())).with_span(&span, self), } } -- cgit 1.4.1