VirtualMachine::{run_frame_full => run_frame}

Author: youknowone

vm/src/builtins/function.rs

@@ -314,7 +314,7 @@ impl PyFunction {
             (true, false) => Ok(PyGenerator::new(frame, self.name()).into_pyobject(vm)),
             (false, true) => Ok(PyCoroutine::new(frame, self.name()).into_pyobject(vm)),
             (true, true) => Ok(PyAsyncGen::new(frame, self.name()).into_pyobject(vm)),
-            (false, false) => vm.run_frame_full(frame),
+            (false, false) => vm.run_frame(frame),
         }
     }
 

vm/src/vm/mod.rs

@@ -273,7 +273,7 @@ impl VirtualMachine {
 
     pub fn run_code_obj(&self, code: PyRef<PyCode>, scope: Scope) -> PyResult {
         let frame = Frame::new(code, scope, self.builtins.dict(), &[], self).into_ref(self);
-        self.run_frame_full(frame)
+        self.run_frame(frame)
     }
 
     #[cold]
@@ -297,8 +297,8 @@ impl VirtualMachine {
     }
 
     #[inline(always)]
-    pub fn run_frame_full(&self, frame: FrameRef) -> PyResult {
-        match self.run_frame(frame)? {
+    pub fn run_frame(&self, frame: FrameRef) -> PyResult {
+        match self.with_frame(frame, |f| f.run(self))? {
             ExecutionResult::Return(value) => Ok(value),
             _ => panic!("Got unexpected result from function"),
         }
@@ -333,10 +333,6 @@ impl VirtualMachine {
         })
     }
 
-    pub fn run_frame(&self, frame: FrameRef) -> PyResult<ExecutionResult> {
-        self.with_frame(frame, |f| f.run(self))
-    }
-
     // To be called right before raising the recursion depth.
     fn check_recursive_call(&self, _where: &str) -> PyResult<()> {
         if self.recursion_depth.get() >= self.recursion_limit.get() {