From c3b13416b02d8e0e68330408b107d3aad29e3a3f Mon Sep 17 00:00:00 2001
From: Vincent Ambo <mail@tazj.in>
Date: Wed, 24 Aug 2022 18:31:43 +0300
Subject: [PATCH] refactor(tvix/eval): add NixAttrs::contains function

This avoids copying around the value more than needed.

Change-Id: I35949d16dad7fb8f76e0f641eaccf48322144777
Reviewed-on: https://cl.tvl.fyi/c/depot/+/6263
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
---
 tvix/eval/src/value/attrs.rs | 12 ++++++++++++
 tvix/eval/src/vm.rs          |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/tvix/eval/src/value/attrs.rs b/tvix/eval/src/value/attrs.rs
index 410969199..bbff79fc0 100644
--- a/tvix/eval/src/value/attrs.rs
+++ b/tvix/eval/src/value/attrs.rs
@@ -66,6 +66,14 @@ impl AttrsRep {
             AttrsRep::Map(map) => map.get(&key.into()),
         }
     }
+
+    fn contains(&self, key: &str) -> bool {
+        match self {
+            AttrsRep::Empty => false,
+            AttrsRep::KV { .. } => key == "name" || key == "value",
+            AttrsRep::Map(map) => map.contains_key(&key.into()),
+        }
+    }
 }
 
 #[repr(transparent)]
@@ -202,6 +210,10 @@ impl NixAttrs {
         self.0.select(key)
     }
 
+    pub fn contains(&self, key: &str) -> bool {
+        self.0.contains(key)
+    }
+
     /// Implement construction logic of an attribute set, to encapsulate
     /// logic about attribute set optimisations inside of this module.
     pub fn construct(count: usize, mut stack_slice: Vec<Value>) -> EvalResult<Self> {
diff --git a/tvix/eval/src/vm.rs b/tvix/eval/src/vm.rs
index b6d5a9838..1e39792cd 100644
--- a/tvix/eval/src/vm.rs
+++ b/tvix/eval/src/vm.rs
@@ -242,7 +242,7 @@ impl VM {
                 OpCode::OpAttrsIsSet => {
                     let key = self.pop().to_string()?;
                     let result = match self.pop() {
-                        Value::Attrs(attrs) => attrs.select(key.as_str()).is_some(),
+                        Value::Attrs(attrs) => attrs.contains(key.as_str()),
 
                         // Nix allows use of `?` on non-set types, but
                         // always returns false in those cases.