From fc963033ae0f28a387d6aebcc1e827439f6653ef Mon Sep 17 00:00:00 2001
From: Adam Joseph <adam@westernsemico.com>
Date: Tue, 12 Dec 2023 03:45:27 -0800
Subject: [PATCH] fix(tvix/eval): `?`: propagate catchables

This commit fixes out `?` operator so it correctly propagates
catchables.

Change-Id: Iebaa153a8492101ee3ddd29893c98730ff331547
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10317
Autosubmit: Adam Joseph <adam@westernsemico.com>
Reviewed-by: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
---
 .../eval-okay-hasattr-catchable.exp           |  1 +
 .../eval-okay-hasattr-catchable.nix           |  1 +
 tvix/eval/src/vm/mod.rs                       | 24 ++++++++++++-------
 3 files changed, 18 insertions(+), 8 deletions(-)
 create mode 100644 tvix/eval/src/tests/tvix_tests/eval-okay-hasattr-catchable.exp
 create mode 100644 tvix/eval/src/tests/tvix_tests/eval-okay-hasattr-catchable.nix

diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-hasattr-catchable.exp b/tvix/eval/src/tests/tvix_tests/eval-okay-hasattr-catchable.exp
new file mode 100644
index 000000000..c508d5366
--- /dev/null
+++ b/tvix/eval/src/tests/tvix_tests/eval-okay-hasattr-catchable.exp
@@ -0,0 +1 @@
+false
diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-hasattr-catchable.nix b/tvix/eval/src/tests/tvix_tests/eval-okay-hasattr-catchable.nix
new file mode 100644
index 000000000..ba85d6b77
--- /dev/null
+++ b/tvix/eval/src/tests/tvix_tests/eval-okay-hasattr-catchable.nix
@@ -0,0 +1 @@
+(builtins.tryEval ((throw "fred") ? bob)).success
diff --git a/tvix/eval/src/vm/mod.rs b/tvix/eval/src/vm/mod.rs
index 44a29ba86..5b9aecb8d 100644
--- a/tvix/eval/src/vm/mod.rs
+++ b/tvix/eval/src/vm/mod.rs
@@ -707,16 +707,24 @@ impl<'o> VM<'o> {
                 }
 
                 OpCode::OpHasAttr => {
-                    let key = self.stack_pop().to_str().with_span(&frame, self)?;
-                    let result = match self.stack_pop() {
-                        Value::Attrs(attrs) => attrs.contains(key.as_str()),
+                    let key = self.stack_pop();
+                    let attrs = self.stack_pop();
+                    if key.is_catchable() {
+                        self.stack.push(key);
+                    } else if attrs.is_catchable() {
+                        self.stack.push(attrs);
+                    } else {
+                        let key = key.to_str().with_span(&frame, self)?;
+                        let result = match attrs {
+                            Value::Attrs(attrs) => attrs.contains(key.as_str()),
 
-                        // Nix allows use of `?` on non-set types, but
-                        // always returns false in those cases.
-                        _ => false,
-                    };
+                            // Nix allows use of `?` on non-set types, but
+                            // always returns false in those cases.
+                            _ => false,
+                        };
 
-                    self.stack.push(Value::Bool(result));
+                        self.stack.push(Value::Bool(result));
+                    }
                 }
 
                 OpCode::OpConcat => {