From a5e22c532b074cca80d15046e6aa109d9ca79a80 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sat, 27 Aug 2022 23:58:46 +0300 Subject: fix(tvix/eval): correctly resolve dynamic upvalues one scope up This does not yet correctly resolve them if they are more than one scope up, however. Change-Id: I6687073c60aee0282f2b6ffc98b34c1e96a60f20 Reviewed-on: https://cl.tvl.fyi/c/depot/+/6319 Tested-by: BuildkiteCI Reviewed-by: sterni --- tvix/eval/src/compiler/mod.rs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'tvix/eval/src/compiler/mod.rs') diff --git a/tvix/eval/src/compiler/mod.rs b/tvix/eval/src/compiler/mod.rs index 6ba470a7af9f..bf5c55db2a0c 100644 --- a/tvix/eval/src/compiler/mod.rs +++ b/tvix/eval/src/compiler/mod.rs @@ -992,12 +992,6 @@ impl Compiler { LocalPosition::Unknown => { /* continue below */ } }; - // Determine whether the upvalue is a dynamic variable in the - // enclosing context. - if self.contexts[ctx_idx - 1].scope.has_with() { - return Some(self.add_upvalue(ctx_idx, Upvalue::Dynamic(SmolStr::new(name)))); - } - // If the upvalue comes from even further up, we need to // recurse to make sure that the upvalues are created at each // level. @@ -1005,6 +999,13 @@ impl Compiler { return Some(self.add_upvalue(ctx_idx, Upvalue::Upvalue(idx))); } + // If the resolution of a statically known upvalue failed, + // attempt to resolve a dynamic one (i.e. search for enclosing + // `with` blocks and make that resolution dynamic). + if self.contexts[ctx_idx - 1].scope.has_with() { + return Some(self.add_upvalue(ctx_idx, Upvalue::Dynamic(SmolStr::new(name)))); + } + None } -- cgit 1.4.1