Remove SET op during return

john-z-yang · Dec 10, 2023 · 23bf8df · 23bf8df
1 parent e94c63b
commit 23bf8df
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/compile/Compiler.cpp b/src/compile/Compiler.cpp
@@ -556,15 +556,12 @@ void Compiler::emitRet() {
     handleTypeError(lambdaGrammar, te.expected, te.actual);
   }
 
-  emitCode(OpCode::SET_STACK, 0);
-
   for (const auto &local : locals) {
     if (local.isCaptured) {
       emitCode(OpCode::CLOSE_UPVALUE, local.stackOffset);
     }
   }
 
-  emitCode(OpCode::POP, stackOffset);
   emitCode(OpCode::RETURN);
 }
 

diff --git a/src/runtime/VM.cpp b/src/runtime/VM.cpp
@@ -127,7 +127,7 @@ const SExpr *VM::exec() {
 MAKE_CLOSURE: {
   const auto proto = cast<Prototype>(readConst());
   std::vector<std::shared_ptr<Upvalue>> upvalues;
-  for (unsigned int i{0}; i < proto->numUpvals; ++i) {
+  for (auto i = 0U; i < proto->numUpvals; ++i) {
     auto isLocal = readByte();
     auto idx = readByte();
     if (isLocal == 1) {
@@ -144,15 +144,17 @@ CALL: { call(readByte()); }
   goto *dispatchTable[readByte()];
 
 RETURN: {
+  const auto res = stack.back();
   if (callFrames.size() == 1) [[unlikely]] {
-    const auto res = stack.back();
     reset();
     return res;
   }
+  stack.erase(stack.end() - (stack.size() - bp - 1), stack.end());
   ip = callFrames.back().ip;
   bp = callFrames.back().bp;
   closure = callFrames.back().closure;
   callFrames.pop_back();
+  stack.back() = res;
 }
   goto *dispatchTable[readByte()];