about summary refs log tree commit diff
path: root/tvix/eval
diff options
context:
space:
mode:
Diffstat (limited to 'tvix/eval')
-rw-r--r--tvix/eval/src/compiler/mod.rs12
1 files changed, 11 insertions, 1 deletions
diff --git a/tvix/eval/src/compiler/mod.rs b/tvix/eval/src/compiler/mod.rs
index 928d39bae595..8defea9a4988 100644
--- a/tvix/eval/src/compiler/mod.rs
+++ b/tvix/eval/src/compiler/mod.rs
@@ -894,7 +894,17 @@ impl Compiler {
 
         self.scope_mut().with_stack.push(With {});
 
-        let with_idx = self.scope().locals.len() - 1;
+        let with_idx = self
+            .scope()
+            .locals
+            .iter()
+            // Calculate the with_idx without taking into account
+            // uninitialised variables that are not yet in their stack
+            // slots.
+            .filter(|l| matches!(l.depth, Depth::At(_)))
+            .count()
+            - 1;
+
         self.chunk().push_op(OpCode::OpPushWith(StackIdx(with_idx)));
 
         self.compile(node.body().unwrap());