diff options
author | Vincent Ambo <mail@tazj.in> | 2023-03-17T21·10+0300 |
---|---|---|
committer | clbot <clbot@tvl.fyi> | 2023-03-22T13·44+0000 |
commit | ba138712e4c4a067e438a62ad20d54091f5f4446 (patch) | |
tree | 79ece7a20ac6872b344c5841eb1d93f8d20daad9 /tvix/eval/src/vm/mod.rs | |
parent | a5f28eea94d74f98e37487ed04a024b83b8a94ff (diff) |
feat(tvix/eval): add Evaluation::strict to toggle top-level deepseq r/6037
This makes it possible for callers to control whether they can receive partially evaluated values from an evaluation or not. We're actually flipping the default behaviour to non-strict top-level evaluation, which means that callers have to set `strict = true` on the Evaluation to get the previous behaviour. Change-Id: Ic048e9ba09c88866d4c3177d5fa07db11c4eb20e Reviewed-on: https://cl.tvl.fyi/c/depot/+/8325 Autosubmit: tazjin <tazjin@tvl.su> Tested-by: BuildkiteCI Reviewed-by: sterni <sternenseemann@systemli.org>
Diffstat (limited to 'tvix/eval/src/vm/mod.rs')
-rw-r--r-- | tvix/eval/src/vm/mod.rs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tvix/eval/src/vm/mod.rs b/tvix/eval/src/vm/mod.rs index 0fb1f9cd8cc9..13158619c69b 100644 --- a/tvix/eval/src/vm/mod.rs +++ b/tvix/eval/src/vm/mod.rs @@ -1190,6 +1190,7 @@ pub fn run_lambda( observer: &mut dyn RuntimeObserver, globals: Rc<GlobalsMap>, lambda: Rc<Lambda>, + strict: bool, ) -> EvalResult<RuntimeResult> { // Retain the top-level span of the expression in this lambda, as // synthetic "calls" in deep_force will otherwise not have a span @@ -1207,9 +1208,11 @@ pub fn run_lambda( root_span.into(), ); - // Synthesise a frame that will instruct the VM to deep-force the final - // value before returning it. - vm.enqueue_generator("final_deep_force", root_span.into(), final_deep_force); + // When evaluating strictly, synthesise a frame that will instruct + // the VM to deep-force the final value before returning it. + if strict { + vm.enqueue_generator("final_deep_force", root_span.into(), final_deep_force); + } vm.frames.push(Frame::CallFrame { span: root_span.into(), |