refactor(tvix/eval): simplify thunk representations r/4676

For now, do not distinguish between closing and non-closing thunks, it
will make the initial implementation easier. See Knuth etc.

Change-Id: I0bd51e0f89f2c77e90bac63b507e5027b649e3d8
Reviewed-on: https://cl.tvl.fyi/c/depot/+/6346
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>

2 files changed, 8 insertions, 8 deletions

diff --git a/tvix/eval/src/compiler/mod.rs b/tvix/eval/src/compiler/mod.rs
index a1f11501a4..2ae010ada6 100644
--- a/tvix/eval/src/compiler/mod.rs
+++ b/tvix/eval/src/compiler/mod.rs
@@ -877,7 +877,7 @@ impl Compiler {
         // Emit the thunk directly if it does not close over the
         // environment.
         if thunk.lambda.upvalue_count == 0 {
-            self.emit_constant(Value::Thunk(Thunk::new(thunk.lambda)));
+            self.emit_constant(Value::Thunk(Thunk::new(Rc::new(thunk.lambda))));
             return;
         }
 
diff --git a/tvix/eval/src/value/thunk.rs b/tvix/eval/src/value/thunk.rs
index 15179388dc..57c38e0894 100644
--- a/tvix/eval/src/value/thunk.rs
+++ b/tvix/eval/src/value/thunk.rs
@@ -27,13 +27,10 @@ use super::Lambda;
 /// Internal representation of the different states of a thunk.
 #[derive(Debug)]
 enum ThunkRepr {
-    /// Thunk is suspended and awaiting execution.
-    Suspended { lambda: Lambda },
-
     /// Thunk is closed over some values, suspended and awaiting
     /// execution.
-    ClosedSuspended {
-        lambda: Lambda,
+    Suspended {
+        lambda: Rc<Lambda>,
         upvalues: Vec<Value>,
     },
 
@@ -49,7 +46,10 @@ enum ThunkRepr {
 pub struct Thunk(Rc<RefCell<ThunkRepr>>);
 
 impl Thunk {
-    pub fn new(lambda: Lambda) -> Self {
-        Thunk(Rc::new(RefCell::new(ThunkRepr::Suspended { lambda })))
+    pub fn new(lambda: Rc<Lambda>) -> Self {
+        Thunk(Rc::new(RefCell::new(ThunkRepr::Suspended {
+            lambda,
+            upvalues: vec![],
+        })))
     }
 }