maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(tvix/eval): nonrecursive deep_force()

Browse source 
This commit implements deep_force() nonrecursively, by maintaining
an explicit stack rather than using the call stack for recursion.

As an added bonus, we don't need to pass around the SharedThunkSet
anymore, and can in fact completely eliminate SharedThunkSet.

Change-Id: I7c4f59f37834d451a28bf6be317eb0a90eac4ee6
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10252
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
Autosubmit: Adam Joseph <adam@westernsemico.com>
This commit is contained in:
Adam Joseph 2023-12-11 01:04:04 -08:00 • committed by clbot
parent c956138ee6
commit 3701379745
5 changed files with 83 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

16
tvix/eval/src/vm/generators.rs
View file

@ -13,7 +13,7 @@ pub use genawaiter::rc::Gen;
use std::fmt::Display;
use std::future::Future;
use crate::value::{PointerEquality, SharedThunkSet};
use crate::value::PointerEquality;
use crate::warnings::{EvalWarning, WarningKind};
use crate::FileType;
use crate::NixString;
@ -43,7 +43,7 @@ pub enum VMRequest {
ForceValue(Value),
/// Request that the VM deep-forces the value.
DeepForceValue(Value, SharedThunkSet),
DeepForceValue(Value),
/// Request the value at the given index from the VM's with-stack, in forced
/// state.
@ -128,7 +128,7 @@ impl Display for VMRequest {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
match self {
VMRequest::ForceValue(v) => write!(f, "force_value({})", v.type_of()),
VMRequest::DeepForceValue(v, _) => {
VMRequest::DeepForceValue(v) => {
write!(f, "deep_force_value({})", v.type_of())
}
VMRequest::WithValue(_) => write!(f, "with_value"),
@ -294,10 +294,10 @@ impl<'o> VM<'o> {
}
// Generator has requested a deep-force.
VMRequest::DeepForceValue(value, thunk_set) => {
VMRequest::DeepForceValue(value) => {
self.reenqueue_generator(name, span.clone(), generator);
self.enqueue_generator("deep_force", span, |co| {
value.deep_force(co, thunk_set)
self.enqueue_generator("deep_force", span.clone(), |co| {
value.deep_force(co, span)
});
return Ok(false);
}
@ -606,8 +606,8 @@ pub async fn request_string_coerce(
}
/// Deep-force any value and return the evaluated result from the VM.
pub async fn request_deep_force(co: &GenCo, val: Value, thunk_set: SharedThunkSet) -> Value {
match co.yield_(VMRequest::DeepForceValue(val, thunk_set)).await {
pub async fn request_deep_force(co: &GenCo, val: Value) -> Value {
match co.yield_(VMRequest::DeepForceValue(val)).await {
VMResponse::Value(value) => value,
msg => panic!(
"Tvix bug: VM responded with incorrect generator message: {}",

4
tvix/eval/src/vm/mod.rs
View file

@ -30,7 +30,7 @@ use crate::{
upvalues::Upvalues,
value::{
Builtin, BuiltinResult, Closure, CoercionKind, Lambda, NixAttrs, NixList, PointerEquality,
SharedThunkSet, Thunk, Value,
Thunk, Value,
},
vm::generators::GenCo,
warnings::{EvalWarning, WarningKind},
@ -1202,7 +1202,7 @@ pub struct RuntimeResult {
/// before returning.
async fn final_deep_force(co: GenCo) -> Result<Value, ErrorKind> {
let value = generators::request_stack_pop(&co).await;
Ok(generators::request_deep_force(&co, value, SharedThunkSet::default()).await)
Ok(generators::request_deep_force(&co, value).await)
}
pub fn run_lambda(