diff options
| -rw-r--r-- | tvix/eval/src/compiler/mod.rs | 1 | ||||
| -rw-r--r-- | tvix/eval/src/vm.rs | 15 |
2 files changed, 11 insertions, 5 deletions
diff --git a/tvix/eval/src/compiler/mod.rs b/tvix/eval/src/compiler/mod.rs index 6be2a1fb05a5..d05989562f66 100644 --- a/tvix/eval/src/compiler/mod.rs +++ b/tvix/eval/src/compiler/mod.rs @@ -862,7 +862,6 @@ impl Compiler<'_, '_> { // resolve that directly (thus avoiding duplication on the // stack). self.compile(slot, node.namespace().unwrap()); - self.emit_force(&node.namespace().unwrap()); let span = self.span_for(&node.namespace().unwrap()); diff --git a/tvix/eval/src/vm.rs b/tvix/eval/src/vm.rs index 89702a090fff..c124a653a019 100644 --- a/tvix/eval/src/vm.rs +++ b/tvix/eval/src/vm.rs @@ -635,10 +635,17 @@ impl<'o> VM<'o> { } /// Resolve a dynamic identifier through the with-stack at runtime. - fn resolve_with(&self, ident: &str) -> EvalResult<Value> { - for idx in self.with_stack.iter().rev() { - let with = fallible!(self, self.stack[*idx].to_attrs()); - match with.select(ident) { + fn resolve_with(&mut self, ident: &str) -> EvalResult<Value> { + // Iterate over the with_stack manually to avoid borrowing + // self, which is required for forcing the set. + for with_stack_idx in (0..self.with_stack.len()).rev() { + let with = self.stack[self.with_stack[with_stack_idx]].clone(); + + if let Value::Thunk(thunk) = &with { + fallible!(self, thunk.force(self)); + } + + match fallible!(self, with.to_attrs()).select(ident) { None => continue, Some(val) => return Ok(val.clone()), } |