do not collapse & inside a FUNCTION_TABLE call, we need the mask

3 files changed, 4 insertions, 0 deletions

diff --git a/tools/js-optimizer.js b/tools/js-optimizer.js
index 151e573a..4829fec8 100644
--- a/tools/js-optimizer.js
+++ b/tools/js-optimizer.js
@@ -584,6 +584,8 @@ function simplifyExpressionsPre(ast) {
             node[3] = value[2];
           }
         }
+      } else if (type == 'sub' && node[1][0] == 'name' && /^FUNCTION_TABLE.*/.exec(node[1][1])) {
+        return null; // do not traverse subchildren here, we should not collapse 55 & 126. TODO: optimize this into a nonvirtual call (also because we lose some other opts here)!
       }
     });
 
diff --git a/tools/test-js-optimizer-asm-pre-output.js b/tools/test-js-optimizer-asm-pre-output.js
index 2cd8d407..301a2ec8 100644
--- a/tools/test-js-optimizer-asm-pre-output.js
+++ b/tools/test-js-optimizer-asm-pre-output.js
@@ -19,6 +19,7 @@ function a() {
  f(g() | 0 & -1);
  f((g() | 0) >> 2);
  $56 = _fcntl() | 0 | 1;
+ FUNCTION_TABLE_ii[55 & 127]() | 0;
 }
 function b($this, $__n) {
  $this = $this | 0;
diff --git a/tools/test-js-optimizer-asm-pre.js b/tools/test-js-optimizer-asm-pre.js
index ca7d2894..c7c92124 100644
--- a/tools/test-js-optimizer-asm-pre.js
+++ b/tools/test-js-optimizer-asm-pre.js
@@ -20,6 +20,7 @@ function a() {
  f(g() | 0 & -1);
  f((g() | 0) >> 2);
  $56 = (_fcntl() | 0) | 1;
+ FUNCTION_TABLE_ii[55 & 127]() | 0;
 }
 function b($this, $__n) {
  $this = $this | 0;