From b8874f8d352f1f255a9eed0fdadc31d45de85e46 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <mail@tazj.in>
Date: Thu, 1 Sep 2022 17:54:41 +0300
Subject: feat(tvix/eval): track source spans for thunks

Change-Id: I73f13c914d84e052a43b4eddb09db1acd8a7076a
Reviewed-on: https://cl.tvl.fyi/c/depot/+/6398
Reviewed-by: sterni <sternenseemann@systemli.org>
Tested-by: BuildkiteCI
---
 tvix/eval/src/compiler/mod.rs | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'tvix/eval/src')

diff --git a/tvix/eval/src/compiler/mod.rs b/tvix/eval/src/compiler/mod.rs
index 1e1e3e3605..e664ceaf5b 100644
--- a/tvix/eval/src/compiler/mod.rs
+++ b/tvix/eval/src/compiler/mod.rs
@@ -147,7 +147,9 @@ impl Compiler<'_> {
             ast::Expr::BinOp(op) => self.compile_binop(slot, op),
             ast::Expr::HasAttr(has_attr) => self.compile_has_attr(slot, has_attr),
             ast::Expr::List(list) => self.compile_list(slot, list),
-            ast::Expr::AttrSet(attrs) => self.thunk(slot, move |c, s| c.compile_attr_set(s, attrs)),
+            ast::Expr::AttrSet(attrs) => self.thunk(slot, &attrs, move |c, a, s| {
+                c.compile_attr_set(s, a.clone())
+            }),
             ast::Expr::Select(select) => self.compile_select(slot, select),
             ast::Expr::Assert(assert) => self.compile_assert(slot, assert),
             ast::Expr::IfElse(if_else) => self.compile_if_else(slot, if_else),
@@ -812,10 +814,10 @@ impl Compiler<'_> {
             // This identifier is referring to a value from the same
             // scope which is not yet defined. This identifier access
             // must be thunked.
-            LocalPosition::Recursive(idx) => self.thunk(slot, move |compiler, _| {
+            LocalPosition::Recursive(idx) => self.thunk(slot, &node, move |compiler, node, _| {
                 let upvalue_idx =
                     compiler.add_upvalue(compiler.contexts.len() - 1, Upvalue::Local(idx));
-                compiler.push_op(OpCode::OpGetUpvalue(upvalue_idx), &node);
+                compiler.push_op(OpCode::OpGetUpvalue(upvalue_idx), node);
             }),
         };
     }
@@ -917,13 +919,14 @@ impl Compiler<'_> {
     /// Compile an expression into a runtime thunk which should be
     /// lazily evaluated when accessed.
     // TODO: almost the same as Compiler::compile_lambda; unify?
-    fn thunk<F>(&mut self, slot: Option<LocalIdx>, content: F)
+    fn thunk<N, F>(&mut self, slot: Option<LocalIdx>, node: &N, content: F)
     where
-        F: FnOnce(&mut Compiler, Option<LocalIdx>),
+        N: AstNode + Clone,
+        F: FnOnce(&mut Compiler, &N, Option<LocalIdx>),
     {
         self.contexts.push(LambdaCtx::new());
         self.begin_scope();
-        content(self, slot);
+        content(self, node, slot);
         self.end_scope();
 
         let thunk = self.contexts.pop().unwrap();
@@ -936,7 +939,7 @@ impl Compiler<'_> {
         // Emit the thunk directly if it does not close over the
         // environment.
         if thunk.lambda.upvalue_count == 0 {
-            self.emit_constant_old(Value::Thunk(Thunk::new(Rc::new(thunk.lambda))));
+            self.emit_constant(Value::Thunk(Thunk::new(Rc::new(thunk.lambda))), node);
             return;
         }
 
@@ -945,7 +948,7 @@ impl Compiler<'_> {
             .chunk()
             .push_constant(Value::Blueprint(Rc::new(thunk.lambda)));
 
-        self.push_op_old(OpCode::OpThunk(blueprint_idx));
+        self.push_op(OpCode::OpThunk(blueprint_idx), node);
         self.emit_upvalue_data(slot, thunk.scope.upvalues);
     }
 
-- 
cgit 1.4.1