1 files changed, 37 insertions, 9 deletions

diff --git a/tvix/eval/src/vm.rs b/tvix/eval/src/vm.rs
index b65a37582f43..a7b9bf3e9206 100644
--- a/tvix/eval/src/vm.rs
+++ b/tvix/eval/src/vm.rs
@@ -9,7 +9,7 @@ use crate::{
     observer::Observer,
     opcode::{CodeIdx, ConstantIdx, Count, JumpOffset, OpCode, StackIdx, UpvalueIdx},
     upvalues::UpvalueCarrier,
-    value::{Closure, Lambda, NixAttrs, NixList, Thunk, Value},
+    value::{Builtin, Closure, Lambda, NixAttrs, NixList, Thunk, Value},
 };
 
 struct CallFrame {
@@ -447,19 +447,33 @@ impl<'o> VM<'o> {
                             self.push(result)
                         }
 
-                        Value::Builtin(builtin) => {
-                            let builtin_name = builtin.name();
-                            self.observer.observe_enter_builtin(builtin_name);
+                        Value::Builtin(builtin) => self.call_builtin(builtin)?,
 
-                            let arg = self.pop();
-                            let result = fallible!(self, builtin.apply(self, arg));
+                        _ => return Err(self.error(ErrorKind::NotCallable)),
+                    };
+                }
 
-                            self.observer.observe_exit_builtin(builtin_name);
+                OpCode::OpTailCall => {
+                    let callable = self.pop();
 
-                            self.push(result);
+                    match callable {
+                        Value::Builtin(builtin) => self.call_builtin(builtin)?,
+
+                        Value::Closure(closure) => {
+                            let lambda = closure.lambda();
+                            self.observer.observe_tail_call(self.frames.len(), &lambda);
+
+                            // Replace the current call frames
+                            // internals with that of the tail-called
+                            // closure.
+                            let mut frame = self.frame_mut();
+                            frame.lambda = lambda;
+                            frame.upvalues = closure.upvalues().to_vec();
+                            frame.ip = 0; // reset instruction pointer to beginning
                         }
+
                         _ => return Err(self.error(ErrorKind::NotCallable)),
-                    };
+                    }
                 }
 
                 OpCode::OpGetUpvalue(upv_idx) => {
@@ -699,6 +713,20 @@ impl<'o> VM<'o> {
             _ => Ok(()),
         }
     }
+
+    fn call_builtin(&mut self, builtin: Builtin) -> EvalResult<()> {
+        let builtin_name = builtin.name();
+        self.observer.observe_enter_builtin(builtin_name);
+
+        let arg = self.pop();
+        let result = fallible!(self, builtin.apply(self, arg));
+
+        self.observer.observe_exit_builtin(builtin_name);
+
+        self.push(result);
+
+        Ok(())
+    }
 }
 
 // TODO: use Rc::unwrap_or_clone once it is stabilised.