diff options
Diffstat (limited to 'tvix/eval/src/vm')
| -rw-r--r-- | tvix/eval/src/vm/generators.rs | 12 | ||||
| -rw-r--r-- | tvix/eval/src/vm/mod.rs | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/tvix/eval/src/vm/generators.rs b/tvix/eval/src/vm/generators.rs index 1b6029e80710..3a256ec55d7e 100644 --- a/tvix/eval/src/vm/generators.rs +++ b/tvix/eval/src/vm/generators.rs @@ -288,7 +288,7 @@ impl<'o> VM<'o> { VMRequest::ForceValue(value) => { self.reenqueue_generator(name, span.clone(), generator); self.enqueue_generator("force", span.clone(), |co| { - value.force(co, span) + value.force_owned_genco(co, span) }); return Ok(false); } @@ -310,7 +310,7 @@ impl<'o> VM<'o> { let value = self.stack[self.with_stack[idx]].clone(); self.enqueue_generator("force", span.clone(), |co| { - value.force(co, span) + value.force_owned_genco(co, span) }); return Ok(false); @@ -327,7 +327,7 @@ impl<'o> VM<'o> { let value = call_frame.upvalues.with_stack().unwrap()[idx].clone(); self.enqueue_generator("force", span.clone(), |co| { - value.force(co, span) + value.force_owned_genco(co, span) }); return Ok(false); @@ -336,8 +336,8 @@ impl<'o> VM<'o> { VMRequest::NixEquality(values, ptr_eq) => { let values = *values; self.reenqueue_generator(name, span.clone(), generator); - self.enqueue_generator("nix_eq", span, |co| { - values.0.nix_eq(values.1, co, ptr_eq) + self.enqueue_generator("nix_eq", span.clone(), |co| { + values.0.nix_eq(values.1, co, ptr_eq, span) }); return Ok(false); } @@ -465,7 +465,7 @@ impl<'o> VM<'o> { ); self.enqueue_generator("force", span.clone(), |co| { - value.force(co, span) + value.force_owned_genco(co, span) }); return Ok(false); } diff --git a/tvix/eval/src/vm/mod.rs b/tvix/eval/src/vm/mod.rs index 6aad8719e0e4..615d77c0e99f 100644 --- a/tvix/eval/src/vm/mod.rs +++ b/tvix/eval/src/vm/mod.rs @@ -615,8 +615,8 @@ impl<'o> VM<'o> { let a = self.stack_pop(); let gen_span = frame.current_light_span(); self.push_call_frame(span, frame); - self.enqueue_generator("nix_eq", gen_span, |co| { - a.nix_eq(b, co, PointerEquality::ForbidAll) + self.enqueue_generator("nix_eq", gen_span.clone(), |co| { + a.nix_eq(b, co, PointerEquality::ForbidAll, gen_span) }); return Ok(false); } |