diff options
| -rw-r--r-- | tvix/eval/src/compiler/mod.rs | 8 | ||||
| -rw-r--r-- | tvix/eval/src/tests/tvix_tests/eval-okay-late-binding-closure.exp | 1 | ||||
| -rw-r--r-- | tvix/eval/src/tests/tvix_tests/eval-okay-late-binding-closure.nix | 4 |
3 files changed, 13 insertions, 0 deletions
diff --git a/tvix/eval/src/compiler/mod.rs b/tvix/eval/src/compiler/mod.rs index 458c7b432899..1df44bdfde37 100644 --- a/tvix/eval/src/compiler/mod.rs +++ b/tvix/eval/src/compiler/mod.rs @@ -678,6 +678,7 @@ impl Compiler { } // Second pass to place the values in the correct stack slots. + let indices: Vec<usize> = entries.iter().map(|(idx, _)| *idx).collect(); for (idx, value) in entries.into_iter() { self.compile(Some(idx), value); @@ -686,6 +687,13 @@ impl Compiler { self.mark_initialised(idx); } + // Third pass to emit finaliser instructions if necessary. + for idx in indices { + if self.scope().locals[idx].needs_finaliser { + self.chunk().push_op(OpCode::OpFinalise(StackIdx(idx))); + } + } + // Deal with the body, then clean up the locals afterwards. self.compile(None, node.body().unwrap()); self.end_scope(); diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-late-binding-closure.exp b/tvix/eval/src/tests/tvix_tests/eval-okay-late-binding-closure.exp new file mode 100644 index 000000000000..d81cc0710eb6 --- /dev/null +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-late-binding-closure.exp @@ -0,0 +1 @@ +42 diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-late-binding-closure.nix b/tvix/eval/src/tests/tvix_tests/eval-okay-late-binding-closure.nix new file mode 100644 index 000000000000..dae170b06bad --- /dev/null +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-late-binding-closure.nix @@ -0,0 +1,4 @@ +let + f = n: n + a; + a = 2; +in f 40 |