diff options
Diffstat (limited to 'tvix/eval/src/vm')
| -rw-r--r-- | tvix/eval/src/vm/generators.rs | 2 | ||||
| -rw-r--r-- | tvix/eval/src/vm/macros.rs | 3 | ||||
| -rw-r--r-- | tvix/eval/src/vm/mod.rs | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/tvix/eval/src/vm/generators.rs b/tvix/eval/src/vm/generators.rs index 3a256ec55d..4fff498fe7 100644 --- a/tvix/eval/src/vm/generators.rs +++ b/tvix/eval/src/vm/generators.rs @@ -337,7 +337,7 @@ impl<'o> VM<'o> { let values = *values; self.reenqueue_generator(name, span.clone(), generator); self.enqueue_generator("nix_eq", span.clone(), |co| { - values.0.nix_eq(values.1, co, ptr_eq, span) + values.0.nix_eq_owned_genco(values.1, co, ptr_eq, span) }); return Ok(false); } diff --git a/tvix/eval/src/vm/macros.rs b/tvix/eval/src/vm/macros.rs index 8a536ee466..34e94bb5fa 100644 --- a/tvix/eval/src/vm/macros.rs +++ b/tvix/eval/src/vm/macros.rs @@ -42,7 +42,8 @@ macro_rules! cmp_op { async fn compare(a: Value, b: Value, co: GenCo) -> Result<Value, ErrorKind> { let a = generators::request_force(&co, a).await; let b = generators::request_force(&co, b).await; - let ordering = a.nix_cmp_ordering(b, co).await?; + let span = generators::request_span(&co).await; + let ordering = a.nix_cmp_ordering(b, co, span).await?; Ok(Value::Bool(cmp_op!(@order $op ordering))) } diff --git a/tvix/eval/src/vm/mod.rs b/tvix/eval/src/vm/mod.rs index 615d77c0e9..99a913c46a 100644 --- a/tvix/eval/src/vm/mod.rs +++ b/tvix/eval/src/vm/mod.rs @@ -616,7 +616,7 @@ impl<'o> VM<'o> { let gen_span = frame.current_light_span(); self.push_call_frame(span, frame); self.enqueue_generator("nix_eq", gen_span.clone(), |co| { - a.nix_eq(b, co, PointerEquality::ForbidAll, gen_span) + a.nix_eq_owned_genco(b, co, PointerEquality::ForbidAll, gen_span) }); return Ok(false); } |