Fix #281

Author: GarboMuffin

src/compiler/iroptimizer.js

@@ -99,6 +99,14 @@ class TypeState {
         });
     }
 
+    /**
+     * @param {TypeState} other
+     * @returns {boolean}
+     */
+    overwrite (other) {
+        return this.mutate(other, varId => other.variables[varId] ?? InputType.ANY);
+    }
+
     /**
      * @param {*} variable A variable codegen object.
      * @param {InputType} type The type to set this variable to
@@ -490,6 +498,8 @@ class IROptimizer {
 
             if (!script || !script.cachedAnalysisEndState) {
                 modified = state.clear() || modified;
+            } else if (script.yields) {
+                modified = state.overwrite(script.cachedAnalysisEndState) || modified;
             } else {
                 modified = state.after(script.cachedAnalysisEndState) || modified;
             }
@@ -578,6 +588,8 @@ class IROptimizer {
 
             if (!script || !script.cachedAnalysisEndState) {
                 modified = state.clear() || modified;
+            } else if (script.yields) {
+                modified = state.overwrite(script.cachedAnalysisEndState) || modified;
             } else {
                 modified = state.after(script.cachedAnalysisEndState) || modified;
             }

test/snapshot/__snapshots__/tw-procedure-return-recursion.sb3.tw-snapshot

@@ -10,7 +10,7 @@ return function* genXYZ () {
 yield* executeInCompatibilityLayer({"MESSAGE":"plan 18",}, b0, false, false, "G", null);
 b1.value = 0;
 b2.value = (yield* thread.procedures["Znon warp recursion should yield %s"](8));
-if ((b1.value === 4)) {
+if (((+b1.value || 0) === 4)) {
 yield* executeInCompatibilityLayer({"MESSAGE":"pass non warp recursion yields",}, b0, false, false, "ao", null);
 }
 b1.value = 0;
@@ -20,7 +20,7 @@ yield* executeInCompatibilityLayer({"MESSAGE":"pass warp recursion does not yiel
 }
 b1.value = 0;
 b2.value = (yield* thread.procedures["Zfib %s"](7));
-if ((b1.value === 20)) {
+if (((+b1.value || 0) === 20)) {
 yield* executeInCompatibilityLayer({"MESSAGE":"pass non warp fib yielded",}, b0, false, false, "au", null);
 }
 yield* thread.procedures["Zrecursing yields between each %s"]("initial");

test/snapshot/__snapshots__/warp-timer/tw-procedure-return-recursion.sb3.tw-snapshot

@@ -10,7 +10,7 @@ return function* genXYZ () {
 yield* executeInCompatibilityLayer({"MESSAGE":"plan 18",}, b0, false, false, "G", null);
 b1.value = 0;
 b2.value = (yield* thread.procedures["Znon warp recursion should yield %s"](8));
-if ((b1.value === 4)) {
+if (((+b1.value || 0) === 4)) {
 yield* executeInCompatibilityLayer({"MESSAGE":"pass non warp recursion yields",}, b0, false, false, "ao", null);
 }
 b1.value = 0;
@@ -20,7 +20,7 @@ yield* executeInCompatibilityLayer({"MESSAGE":"pass warp recursion does not yiel
 }
 b1.value = 0;
 b2.value = (yield* thread.procedures["Zfib %s"](7));
-if ((b1.value === 20)) {
+if (((+b1.value || 0) === 20)) {
 yield* executeInCompatibilityLayer({"MESSAGE":"pass non warp fib yielded",}, b0, false, false, "au", null);
 }
 yield* thread.procedures["Zrecursing yields between each %s"]("initial");