vm: If popCount == _stack.Count in ExitBlock, just clear the stack an…

…d return
PaddiM8 · Dec 9, 2024 · 56b1a0c · 56b1a0c
1 parent 154228a
commit 56b1a0c
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/Vm/InstructionExecutor.cs b/src/Vm/InstructionExecutor.cs
@@ -655,14 +655,19 @@ private void UnpackUpper(byte count)
 
     private void ExitBlock(byte popCount)
     {
-        if (_stack.Count == 1)
+        if (_stack.Count == popCount)
+        {
+            while (_stack.Any())
+                Pop();
+
             return;
+        }
 
-        var returnValue = _stack.Pop();
+        var returnValue = _stack.PopObject() as RuntimeObject;
         for (byte i = 0; i < popCount; i++)
             Pop();
 
-        _stack.Push(returnValue);
+        _stack.Push(returnValue ?? RuntimeNil.Value);
     }
 
     private void Ret()