From 09a57e7857d85cf27b88a8aca21a0dc96847c040 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Wed, 28 Sep 2022 13:34:31 +0300 Subject: refactor(tvix/eval): emit OpAttrs inside of compile_bindings This needs to move here so that we can reuse compile_bindings for the nested attribute sets we're about to start constructing. Change-Id: Ie83f52f7e1d128886e96a1da47792211fa826f21 Reviewed-on: https://cl.tvl.fyi/c/depot/+/6796 Reviewed-by: sterni Tested-by: BuildkiteCI --- tvix/eval/src/compiler/bindings.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tvix/eval/src/compiler/bindings.rs') diff --git a/tvix/eval/src/compiler/bindings.rs b/tvix/eval/src/compiler/bindings.rs index 95ae85569aaa..7d6b30569392 100644 --- a/tvix/eval/src/compiler/bindings.rs +++ b/tvix/eval/src/compiler/bindings.rs @@ -319,8 +319,7 @@ impl Compiler<'_> { BindingsKind::Attrs }; - let count = self.compile_bindings(slot, kind, &node); - self.push_op(OpCode::OpAttrs(Count(count)), &node); + self.compile_bindings(slot, kind, &node); // Remove the temporary scope, but do not emit any additional cleanup // (OpAttrs consumes all of these locals). @@ -389,7 +388,7 @@ impl Compiler<'_> { } } - fn compile_bindings(&mut self, slot: LocalIdx, kind: BindingsKind, node: &N) -> usize + fn compile_bindings(&mut self, slot: LocalIdx, kind: BindingsKind, node: &N) where N: ToSpan + ast::HasEntry, { @@ -406,7 +405,9 @@ impl Compiler<'_> { // Actually bind values and ensure they are on the stack. self.bind_values(bindings); - count + if kind.is_attrs() { + self.push_op(OpCode::OpAttrs(Count(count)), node); + } } /// Compile a standard `let ...; in ...` expression. @@ -425,7 +426,6 @@ impl Compiler<'_> { self.emit_warning(&node, WarningKind::DeprecatedLegacyLet); self.scope_mut().begin_scope(); self.compile_bindings(slot, BindingsKind::RecAttrs, &node); - self.push_op(OpCode::OpAttrs(Count(node.entries().count())), &node); self.emit_constant(Value::String(SmolStr::new_inline("body").into()), &node); self.push_op(OpCode::OpAttrsSelect, &node); } -- cgit 1.4.1