fix bug with lack of recursion in simplifyBitops

kripken · kripken · commit 486db79e9324 · 2013-01-08T15:12:12.000-08:00
diff --git a/tools/js-optimizer.js b/tools/js-optimizer.js
@@ -418,20 +418,25 @@ function simplifyExpressionsPre(ast) {
     var rerun = true;
     while (rerun) {
       rerun = false;
-      traverseGenerated(ast, function(node, type, stack) {
+      traverseGenerated(ast, function process(node, type, stack) {
         if (type == 'binary' && node[1] == '|' && (jsonCompare(node[2], ZERO) || jsonCompare(node[3], ZERO))) {
-          stack.push(1); // From here on up, no need for this kind of correction, it's done at the top
-
           // We might be able to remove this correction
-          for (var i = stack.length-2; i >= 0; i--) {
+          for (var i = stack.length-1; i >= 0; i--) {
             if (stack[i] == 1) {
               // Great, we can eliminate
               rerun = true;
-              return jsonCompare(node[2], ZERO) ? node[3] : node[2];
+              // we will replace ourselves with the non-zero side. Recursively process that node.
+              var result = jsonCompare(node[2], ZERO) ? node[3] : node[2], other;
+              while (other = process(result, result[0], stack)) {
+                result = other;
+              }
+              return result;
             } else if (stack[i] == -1) {
               break; // Too bad, we can't
             }
           }
+          stack.push(1); // From here on up, no need for this kind of correction, it's done at the top
+                         // (Add this at the end, so it is only added if we did not remove it)
         } else if (type == 'binary' && node[1] in USEFUL_BINARY_OPS) {
           stack.push(1);
         } else if ((type == 'binary' && node[1] in SAFE_BINARY_OPS) || type == 'num' || type == 'name') {
diff --git a/tools/test-js-optimizer-output.js b/tools/test-js-optimizer-output.js
@@ -290,5 +290,8 @@ function asmy() {
   f((HEAPU8[_buf + i6 & 16777215] & 1) + i5 | 0);
   f((HEAP8[_buf + i6 & 16777215] & 1) + i5 | 0);
   f((HEAPU8[_buf + i6 & 16777215] & 1) + i5 | 0);
+  if ((_sbrk($419 | 0) | 0) == -1) {
+    print("fleefl");
+  }
 }
 
diff --git a/tools/test-js-optimizer.js b/tools/test-js-optimizer.js
@@ -400,5 +400,8 @@ function asmy() {
   f((HEAPU8[_buf + i6 & 16777215] & 255 & 1) + i5 | 0);
   f((HEAP8[_buf + i6 & 16777215] & 1 & 255) + i5 | 0);
   f((HEAPU8[_buf + i6 & 16777215] & 1 & 255) + i5 | 0);
+  if ((_sbrk($419 | 0) | 0 | 0) == -1) {
+    print('fleefl');
+  }
 }
 // EMSCRIPTEN_GENERATED_FUNCTIONS: ["abc", "xyz", "xyz2", "expr", "loopy", "bits", "maths", "hoisting", "demangle", "lua", "moreLabels", "notComps", "tricky", "asmy"]

Original file line number	Diff line number	Diff line change
`@@ -290,5 +290,8 @@ function asmy() {`
`290`	`290`	`f((HEAPU8[_buf + i6 & 16777215] & 1) + i5 \| 0);`
`291`	`291`	`f((HEAP8[_buf + i6 & 16777215] & 1) + i5 \| 0);`
`292`	`292`	`f((HEAPU8[_buf + i6 & 16777215] & 1) + i5 \| 0);`
	`293`	`+ if ((_sbrk($419 \| 0) \| 0) == -1) {`
	`294`	`+ print("fleefl");`
	`295`	`+ }`
`293`	`296`	`}`
`294`	`297`
Original file line number	Diff line number	Diff line change
`@@ -400,5 +400,8 @@ function asmy() {`
`400`	`400`	`f((HEAPU8[_buf + i6 & 16777215] & 255 & 1) + i5 \| 0);`
`401`	`401`	`f((HEAP8[_buf + i6 & 16777215] & 1 & 255) + i5 \| 0);`
`402`	`402`	`f((HEAPU8[_buf + i6 & 16777215] & 1 & 255) + i5 \| 0);`
	`403`	`+ if ((_sbrk($419 \| 0) \| 0 \| 0) == -1) {`
	`404`	`+ print('fleefl');`
	`405`	`+ }`
`403`	`406`	`}`
`404`	`407`	`// EMSCRIPTEN_GENERATED_FUNCTIONS: ["abc", "xyz", "xyz2", "expr", "loopy", "bits", "maths", "hoisting", "demangle", "lua", "moreLabels", "notComps", "tricky", "asmy"]`