From 7ddea7340f547166a3c3f7fdd0afa776d9ba35aa Mon Sep 17 00:00:00 2001
From: Adam Joseph <adam@westernsemico.com>
Date: Tue, 12 Dec 2023 21:18:09 -0800
Subject: fix(tvix/eval): catchable in type field of nix_eq()

Change-Id: I165ff77764e272cc94d18cb03ad6cbc9a8ebefde
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10348
Autosubmit: Adam Joseph <adam@westernsemico.com>
Reviewed-by: sterni <sternenseemann@systemli.org>
Tested-by: BuildkiteCI
---
 tvix/eval/src/vm/generators.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'tvix/eval/src/vm')

diff --git a/tvix/eval/src/vm/generators.rs b/tvix/eval/src/vm/generators.rs
index 9686e6542f..716aaf96b4 100644
--- a/tvix/eval/src/vm/generators.rs
+++ b/tvix/eval/src/vm/generators.rs
@@ -631,12 +631,13 @@ pub(crate) async fn check_equality(
     a: Value,
     b: Value,
     ptr_eq: PointerEquality,
-) -> Result<bool, ErrorKind> {
+) -> Result<Result<bool, CatchableErrorKind>, ErrorKind> {
     match co
         .yield_(VMRequest::NixEquality(Box::new((a, b)), ptr_eq))
         .await
     {
-        VMResponse::Value(value) => value.as_bool(),
+        VMResponse::Value(Value::Bool(b)) => Ok(Ok(b)),
+        VMResponse::Value(Value::Catchable(cek)) => Ok(Err(cek)),
         msg => panic!(
             "Tvix bug: VM responded with incorrect generator message: {}",
             msg
-- 
cgit 1.4.1