Merge pull request #279

More misc compiler fixes

Author: GarboMuffin

src/compiler/iroptimizer.js

@@ -1,6 +1,7 @@
 // @ts-check
 
 const {StackOpcode, InputOpcode, InputType} = require('./enums.js');
+const log = require('../util/log');
 
 // These imports are used by jsdoc comments but eslint doesn't know that
 /* eslint-disable no-unused-vars */
@@ -16,7 +17,7 @@ const {
 class TypeState {
     constructor () {
         /** @type {Object.<string, InputType | 0>}*/
-        this.variables = {};
+        this.variables = Object.create(null);
     }
 
     /**
@@ -30,7 +31,7 @@ class TypeState {
                 break;
             }
         }
-        this.variables = {};
+        this.variables = Object.create(null);
         return modified;
     }
 
@@ -93,7 +94,7 @@ class TypeState {
     after (other) {
         return this.mutate(other, varId => {
             const otherType = other.variables[varId];
-            if (otherType !== 0) return otherType;
+            if (otherType) return otherType;
             return this.variables[varId] ?? InputType.ANY;
         });
     }
@@ -541,29 +542,37 @@ class IROptimizer {
             state = state.clone();
         }
 
-        modified = this.analyzeInputs(inputs, state) || modified;
-
         switch (stackBlock.opcode) {
         case StackOpcode.VAR_SET:
+            modified = this.analyzeInputs(inputs, state) || modified;
             modified = state.setVariableType(inputs.variable, inputs.value.type) || modified;
             break;
         case StackOpcode.CONTROL_WHILE:
         case StackOpcode.CONTROL_FOR:
         case StackOpcode.CONTROL_REPEAT:
+            modified = this.analyzeInputs(inputs, state) || modified;
             modified = this.analyzeLoopedStack(inputs.do, state, stackBlock) || modified;
             break;
         case StackOpcode.CONTROL_IF_ELSE: {
+            modified = this.analyzeInputs(inputs, state) || modified;
             const trueState = state.clone();
             modified = this.analyzeStack(inputs.whenTrue, trueState) || modified;
             modified = this.analyzeStack(inputs.whenFalse, state) || modified;
             modified = state.or(trueState) || modified;
             break;
         }
         case StackOpcode.CONTROL_STOP_SCRIPT: {
+            modified = this.analyzeInputs(inputs, state) || modified;
             this.addPossibleExitState(state);
             break;
         }
+        case StackOpcode.CONTROL_WAIT_UNTIL: {
+            modified = state.clear() || modified;
+            modified = this.analyzeInputs(inputs, state) || modified;
+            break;
+        }
         case StackOpcode.PROCEDURE_CALL: {
+            modified = this.analyzeInputs(inputs, state) || modified;
             modified = this.analyzeInputs(inputs.inputs, state) || modified;
             const script = this.ir.procedures[inputs.variant];
 
@@ -575,6 +584,7 @@ class IROptimizer {
             break;
         }
         case StackOpcode.COMPATIBILITY_LAYER: {
+            modified = this.analyzeInputs(inputs, state) || modified;
             this.analyzeInputs(inputs.inputs, state);
             for (const substackName in inputs.substacks) {
                 const newState = state.clone();
@@ -583,6 +593,9 @@ class IROptimizer {
             }
             break;
         }
+        default:
+            modified = this.analyzeInputs(inputs, state) || modified;
+            break;
         }
 
         return modified;
@@ -635,7 +648,7 @@ class IROptimizer {
         do {
             // If we are stuck in an apparent infinite loop, give up and assume the worst.
             if (iterations > 10000) {
-                console.error('analyzeLoopedStack stuck in likely infinite loop; quitting', block, state);
+                log.error('analyzeLoopedStack stuck in likely infinite loop; quitting', block, state);
                 modified = state.clear();
                 block.entryState = state.clone();
                 block.exitState = state.clone();
@@ -646,8 +659,8 @@ class IROptimizer {
 
             const newState = state.clone();
             modified = this.analyzeStack(stack, newState) || modified;
-            modified = this.analyzeInputs(block.inputs, newState) || modified;
             modified = (keepLooping = state.or(newState)) || modified;
+            modified = this.analyzeInputs(block.inputs, state) || modified;
         } while (keepLooping);
         block.entryState = state.clone();
         return modified;

test/fixtures/execute/tw-loop-condition-optimization-gh-276.sb3

@@ -67,10 +67,10 @@ b0.value = (b1.value[(((((+p1 || 0) + (+p0 || 0)) || 0) / 2) | 0) - 1] ?? "");
 b2.value = p0;
 b3.value = p1;
 while (true) {
-while (compareLessThan((b1.value[(b2.value | 0) - 1] ?? ""), b0.value)) {
+while (compareLessThan(listGet(b1.value, b2.value), b0.value)) {
 b2.value = ((+b2.value || 0) + 1);
 }
-while (compareGreaterThan((b1.value[(b3.value | 0) - 1] ?? ""), b0.value)) {
+while (compareGreaterThan(listGet(b1.value, b3.value), b0.value)) {
 b3.value = ((+b3.value || 0) + -1);
 }
 if (compareGreaterThan(b2.value, b3.value)) {

test/fixtures/execute/tw-non-warp-loop-condition-analysis.sb3

@@ -0,0 +1,28 @@
+// TW Snapshot
+// Input SHA-256: 3c81a01417b9a927457132a5f89b63e54b2499714376246739535b51dbce2d45
+
+// Sprite1 script
+(function factoryXYZ(thread) { const target = thread.target; const runtime = target.runtime; const stage = runtime.getTargetForStage();
+const b0 = runtime.getOpcodeFunction("looks_say");
+const b1 = stage.variables["`jEk@4|i[#Fk?(8x)AV.-my variable"];
+return function* genXYZ () {
+yield* executeInCompatibilityLayer({"MESSAGE":"plan 1",}, b0, false, false, "g", null);
+thread.procedures["Wtest %s"]("random");
+if ((("" + b1.value).toLowerCase() === "random".toLowerCase())) {
+yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "p", null);
+}
+yield* executeInCompatibilityLayer({"MESSAGE":"end",}, b0, false, false, "n", null);
+retire(); return;
+}; })
+
+// Sprite1 Wtest %s
+(function factoryXYZ(thread) { const target = thread.target; const runtime = target.runtime; const stage = runtime.getTargetForStage();
+const b0 = stage.variables["`jEk@4|i[#Fk?(8x)AV.-my variable"];
+const b1 = stage.variables["t)]?yi[*8XU73qhMqOa8"];
+return function funXYZ_test_ (p0) {
+b0.value = p0;
+while (!(("" + listGet(b1.value, b0.value)).toLowerCase() === "something".toLowerCase())) {
+b0.value = ((+b0.value || 0) + 1);
+}
+return "";
+}; })

test/fixtures/execute/tw-sound-menu-avoids-number-literal-if-name-conflict.sb3

@@ -0,0 +1,29 @@
+// TW Snapshot
+// Input SHA-256: be149d21cc69628647000cc698ebd60949252730a0ea7b19f71cc85fe927b294
+
+// Sprite1 script
+(function factoryXYZ(thread) { const target = thread.target; const runtime = target.runtime; const stage = runtime.getTargetForStage();
+const b0 = runtime.getOpcodeFunction("looks_say");
+const b1 = stage.variables["%ehs:~!Y0l-5=!mnd-B?"];
+const b2 = stage.variables["=3aHfv[mKa)v,Wfpy:y?"];
+const b3 = stage.variables["`jEk@4|i[#Fk?(8x)AV.-my variable"];
+return function* genXYZ () {
+yield* executeInCompatibilityLayer({"MESSAGE":"plan 1",}, b0, false, false, "d", null);
+b1.value = [];
+b1.value.push((1 + 2));
+b1._monitorUpToDate = false;
+b1.value.push("eof");
+b1._monitorUpToDate = false;
+b2.value = 0;
+b3.value = "bwah";
+while (!(("" + b3.value).toLowerCase() === "eof".toLowerCase())) {
+b2.value = ((+b2.value || 0) + 1);
+b3.value = (b1.value[(b2.value | 0) - 1] ?? "");
+yield;
+}
+if (((+b2.value || 0) === 2)) {
+yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "q", null);
+}
+yield* executeInCompatibilityLayer({"MESSAGE":"end",}, b0, false, false, "o", null);
+retire(); return;
+}; })