From 207f3dd47e90c1ccc80b4775c1b2d13e5bfc6a72 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sat, 8 Oct 2022 22:06:27 +0300 Subject: fix(tvix/eval): end scope after compiling legacy let bindings When contrasting the compilation of the desugared version to the "sugared" version, this was the noticeable difference. This fixes b/203. Change-Id: Iae02ffc56e06de1de091b84cdc59d8fe83a17d69 Reviewed-on: https://cl.tvl.fyi/c/depot/+/6898 Reviewed-by: grfn Autosubmit: tazjin Tested-by: BuildkiteCI --- tvix/eval/src/compiler/bindings.rs | 5 +++++ tvix/eval/src/tests/tvix_tests/eval-okay-legacy-let-in-with.exp | 1 + tvix/eval/src/tests/tvix_tests/eval-okay-legacy-let-in-with.nix | 1 + 3 files changed, 7 insertions(+) create mode 100644 tvix/eval/src/tests/tvix_tests/eval-okay-legacy-let-in-with.exp create mode 100644 tvix/eval/src/tests/tvix_tests/eval-okay-legacy-let-in-with.nix (limited to 'tvix') diff --git a/tvix/eval/src/compiler/bindings.rs b/tvix/eval/src/compiler/bindings.rs index ca437e90e996..9f7df1fdca19 100644 --- a/tvix/eval/src/compiler/bindings.rs +++ b/tvix/eval/src/compiler/bindings.rs @@ -659,6 +659,11 @@ impl Compiler<'_> { self.emit_warning(node, WarningKind::DeprecatedLegacyLet); self.scope_mut().begin_scope(); self.compile_bindings(slot, BindingsKind::RecAttrs, node); + + // Remove the temporary scope, but do not emit any additional cleanup + // (OpAttrs consumes all of these locals). + self.scope_mut().end_scope(); + self.emit_constant(Value::String(SmolStr::new_inline("body").into()), node); self.push_op(OpCode::OpAttrsSelect, node); } diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-legacy-let-in-with.exp b/tvix/eval/src/tests/tvix_tests/eval-okay-legacy-let-in-with.exp new file mode 100644 index 000000000000..d81cc0710eb6 --- /dev/null +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-legacy-let-in-with.exp @@ -0,0 +1 @@ +42 diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-legacy-let-in-with.nix b/tvix/eval/src/tests/tvix_tests/eval-okay-legacy-let-in-with.nix new file mode 100644 index 000000000000..a5b05426689e --- /dev/null +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-legacy-let-in-with.nix @@ -0,0 +1 @@ +with {}; let { body = 42; } -- cgit 1.4.1