From ad566999ca81e5d584acb5107e327a1aec9fdd5a Mon Sep 17 00:00:00 2001
From: Adam Joseph <adam@westernsemico.com>
Date: Sat, 9 Dec 2023 00:58:30 -0800
Subject: fix(tvix/eval): preserve catchables in nix_cmp_ordering(), fix b/338

This commit fixes b/338 by properly propagating catchables through
comparison operations.

Change-Id: I6b0283a40f228ecf9a6398d24c060bdacb1077cf
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10221
Reviewed-by: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
Autosubmit: Adam Joseph <adam@westernsemico.com>
---
 tvix/eval/src/value/mod.rs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'tvix/eval/src/value/mod.rs')

diff --git a/tvix/eval/src/value/mod.rs b/tvix/eval/src/value/mod.rs
index 7b64e9fc8f..9be57d43f5 100644
--- a/tvix/eval/src/value/mod.rs
+++ b/tvix/eval/src/value/mod.rs
@@ -616,7 +616,7 @@ impl Value {
         other: Self,
         co: GenCo,
         span: LightSpan,
-    ) -> Result<Ordering, ErrorKind> {
+    ) -> Result<Result<Ordering, CatchableErrorKind>, ErrorKind> {
         Self::nix_cmp_ordering_(self, other, co, span).await
     }
 
@@ -625,7 +625,7 @@ impl Value {
         other: Self,
         co: GenCo,
         span: LightSpan,
-    ) -> Result<Ordering, ErrorKind> {
+    ) -> Result<Result<Ordering, CatchableErrorKind>, ErrorKind> {
         // this is a stack of ((v1,v2),peq) triples to be compared;
         // after each triple is popped off of the stack, v1 is
         // compared to v2 using peq-mode PointerEquality
@@ -636,7 +636,7 @@ impl Value {
                 abp
             } else {
                 // stack is empty, so they are equal
-                return Ok(Ordering::Equal);
+                return Ok(Ok(Ordering::Equal));
             };
             if ptr_eq == PointerEquality::AllowAll {
                 if a.clone()
@@ -650,6 +650,8 @@ impl Value {
                 b = b.force(&co, span.clone()).await?;
             }
             let result = match (a, b) {
+                (Value::Catchable(c), _) => return Ok(Err(c)),
+                (_, Value::Catchable(c)) => return Ok(Err(c)),
                 // same types
                 (Value::Integer(i1), Value::Integer(i2)) => i1.cmp(&i2),
                 (Value::Float(f1), Value::Float(f2)) => f1.total_cmp(&f2),
@@ -682,7 +684,7 @@ impl Value {
                 }
             };
             if result != Ordering::Equal {
-                return Ok(result);
+                return Ok(Ok(result));
             }
         }
     }
-- 
cgit 1.4.1