log errors for primitives that do not properly pop the stack

codefrau · Jan 6, 2021 · ca63f69 · ca63f69
1 parent d67f412
commit ca63f69
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/vm.interpreter.js b/vm.interpreter.js
@@ -1094,7 +1094,16 @@ Object.subclass('Squeak.Interpreter',
             this.popNandPush(1, primIndex - 261); //return -1...2
             return true;
         }
+        var sp = this.sp;
+        var context = this.activeContext;
         var success = this.primHandler.doPrimitive(primIndex, argCount, newMethod);
+        if (success 
+            && this.sp !== sp - argCount
+            && context === this.activeContext
+            && primIndex !== 117    // named prims are checked separately 
+            && !this.frozen) {
+                this.warnOnce("stack unbalanced after primitive " + primIndex, "error");
+            }
         return success;
     },
     createActualMessage: function(selector, argCount, cls) {
@@ -1471,9 +1480,9 @@ Object.subclass('Squeak.Interpreter',
     addMessage: function(message) {
         return this.messages[message] ? ++this.messages[message] : this.messages[message] = 1;
     },
-    warnOnce: function(message) {
+    warnOnce: function(message, what) {
         if (this.addMessage(message) == 1)
-            console.warn(message);
+            console[what || "warn"](message);
     },
     printMethod: function(aMethod, optContext, optSel) {
         // return a 'class>>selector' description for the method

diff --git a/vm.primitives.js b/vm.primitives.js
@@ -427,6 +427,7 @@ Object.subclass('Squeak.Primitives',
             this.loadedModules[modName] = mod;
         }
         var result = false;
+        var sp = this.vm.sp;
         if (mod) {
             this.interpreterProxy.argCount = argCount;
             var primitive = mod[functionName];
@@ -441,6 +442,9 @@ Object.subclass('Squeak.Primitives',
         } else {
             this.vm.warnOnce("missing module: " + modName + " (" + functionName + ")");
         }
+        if ((result === true || (result !== false && this.success)) && this.vm.sp !== sp - argCount && !this.vm.frozen) {
+            this.vm.warnOnce("stack unbalanced after primitive " + modName + "." + functionName, "error");
+        }
         if (result === true || result === false) return result;
         return this.success;
     },