diff options
| author | Vincent Ambo <mail@tazj.in> | 2022-08-29T15·40+0300 |
|---|---|---|
| committer | tazjin <tazjin@tvl.su> | 2022-09-07T15·25+0000 |
| commit | 786e12a7382eaaa957389b3a9e9e962efe7e8403 (patch) | |
| tree | e86c9b9d96ab2d7bb480efe9eb52943c96d93d59 /tvix/eval | |
| parent | 9a783e50a490a873f157ec298165b3f38973e4b5 (diff) | |
feat(tvix/eval): always emit OpForce as the last instruction r/4689
Change-Id: Id70c987f654dc5d9b47db74e395281309762b468 Reviewed-on: https://cl.tvl.fyi/c/depot/+/6353 Tested-by: BuildkiteCI Reviewed-by: sterni <sternenseemann@systemli.org>
Diffstat (limited to 'tvix/eval')
| -rw-r--r-- | tvix/eval/src/compiler/mod.rs | 6 | ||||
| -rw-r--r-- | tvix/eval/src/tests/tvix_tests/eval-okay-nested-thunks.exp | 1 | ||||
| -rw-r--r-- | tvix/eval/src/tests/tvix_tests/eval-okay-nested-thunks.nix | 7 |
3 files changed, 14 insertions, 0 deletions
diff --git a/tvix/eval/src/compiler/mod.rs b/tvix/eval/src/compiler/mod.rs index 2ae010ada6..e3cb15032a 100644 --- a/tvix/eval/src/compiler/mod.rs +++ b/tvix/eval/src/compiler/mod.rs @@ -1256,6 +1256,12 @@ pub fn compile( c.compile(None, expr); + // The final operation of any top-level Nix program must always be + // `OpForce`. A thunk should not be returned to the user in an + // unevaluated state (though in practice, a value *containing* a + // thunk might be returned). + c.chunk().push_op(OpCode::OpForce); + Ok(CompilationOutput { lambda: c.contexts.pop().unwrap().lambda, warnings: c.warnings, diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-nested-thunks.exp b/tvix/eval/src/tests/tvix_tests/eval-okay-nested-thunks.exp new file mode 100644 index 0000000000..d81cc0710e --- /dev/null +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-nested-thunks.exp @@ -0,0 +1 @@ +42 diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-nested-thunks.nix b/tvix/eval/src/tests/tvix_tests/eval-okay-nested-thunks.nix new file mode 100644 index 0000000000..133929dd19 --- /dev/null +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-nested-thunks.nix @@ -0,0 +1,7 @@ +# If a thunk yields another thunk, OpForce should keep forcing until +# there is a value. +let + a = b; + b = c; + c = 42; +in a |