fix(tvix/eval): `or` should handle non-attrset values, too r/4543

If a nested attrpath encounters a non-set value, the sentinel value
denoting a lack of next values should be emitted. This mirrors the
behaviour of Nix.

Change-Id: Ia80443d5a11243cc6d98dcab1249a3f5fdf77e27
Reviewed-on: https://cl.tvl.fyi/c/depot/+/6210
Reviewed-by: grfn <grfn@gws.fyi>
Tested-by: BuildkiteCI

1 files changed, 9 insertions, 5 deletions

diff --git a/tvix/eval/src/vm.rs b/tvix/eval/src/vm.rs
index d050fa8071..d18cd7977b 100644
--- a/tvix/eval/src/vm.rs
+++ b/tvix/eval/src/vm.rs
@@ -182,12 +182,16 @@ impl VM {
 
                 OpCode::OpAttrOrNotFound => {
                     let key = self.pop().to_string()?;
-                    let attrs = self.pop().to_attrs()?;
+                    let value = match self.pop() {
+                        Value::Attrs(attrs) => match attrs.select(key.as_str()) {
+                            Some(value) => value.clone(),
+                            None => Value::NotFound,
+                        },
 
-                    match attrs.select(key.as_str()) {
-                        Some(value) => self.push(value.clone()),
-                        None => self.push(Value::NotFound),
-                    }
+                        _ => Value::NotFound,
+                    };
+
+                    self.push(value);
                 }
 
                 OpCode::OpAttrsIsSet => {