1 files changed, 20 insertions, 5 deletions
diff --git a/tools/js-optimizer.js b/tools/js-optimizer.js
index 8db40bc6..69abe23a 100644
--- a/tools/js-optimizer.js
+++ b/tools/js-optimizer.js
@@ -428,12 +428,13 @@ function simplifyExpressionsPre(ast) {
               if (stack[i] == 1) {
                 // we will replace ourselves with the non-zero side. Recursively process that node.
                 var result = jsonCompare(node[2], ZERO) ? node[3] : node[2], other;
-                // Great, we can eliminate
-                rerun = true;
-                while (other = process(result, result[0], stack)) {
-                  result = other;
+                // replace node in-place
+                node.length = result.length;
+                for (var j = 0; j < result.length; j++) {
+                  node[j] = result[j];
                 }
-                return result;
+                rerun = true;
+                return process(result, result[0], stack);
               } else if (stack[i] == -1) {
                 break; // Too bad, we can't
               } else if (asm) {
@@ -473,6 +474,12 @@ function simplifyExpressionsPre(ast) {
               if (!unsigned) {
                 input[1][1] = 'HEAPU' + bits; // make unsigned
               }
+              if (asm) {
+                // we cannot return HEAPU8 without a coercion, but at least we do HEAP8 & 255 => HEAPU8 | 0
+                node[1] = '|';
+                node[3][1] = 0;
+                return node;
+              }
               return input;
             }
           }
@@ -1316,6 +1323,14 @@ function normalizeAsm(func) {
   while (i < stats.length) {
     traverse(stats[i], function(node, type) {
       if (type == 'var') {
+        for (var j = 0; j < node[1].length; j++) {
+          var v = node[1][j];
+          var name = v[0];
+          var value = v[1];
+          if (!(name in data.vars)) {
+            data.vars[name] = detectAsmCoercion(value);
+          }
+        }
         unVarify(node[1], node);
       } else if (type == 'dot') {
         if (node[1][0] == 'name' && node[1][1] == 'Math') {