registerize in asm switches

2 files changed, 9 insertions, 9 deletions

diff --git a/tools/js-optimizer.js b/tools/js-optimizer.js
index 4b0938c2..a52ad6b7 100644
--- a/tools/js-optimizer.js
+++ b/tools/js-optimizer.js
@@ -1505,7 +1505,7 @@ function registerize(ast) {
     // Replace all var definitions with assignments; we will add var definitions at the top after we registerize
     // We also mark local variables - i.e., having a var definition
     var localVars = {};
-    var hasSwitch = false; // we cannot optimize variables if there is a switch
+    var hasSwitch = false; // we cannot optimize variables if there is a switch, unless in asm mode
     traverse(fun, function(node, type) {
       if (type == 'var') {
         node[1].forEach(function(defined) { localVars[defined[0]] = 1 });
@@ -1630,7 +1630,7 @@ function registerize(ast) {
       }
     });
     var optimizables = {};
-    if (!hasSwitch) {
+    if (!hasSwitch || asm) {
       for (var possible in possibles) {
         if (!unoptimizables[possible]) optimizables[possible] = 1;
       }
diff --git a/tools/test-js-optimizer-asm-regs-output.js b/tools/test-js-optimizer-asm-regs-output.js
index 71155410..ba2316ea 100644
--- a/tools/test-js-optimizer-asm-regs-output.js
+++ b/tools/test-js-optimizer-asm-regs-output.js
@@ -25,15 +25,15 @@ function stackRestore(i1) {
 function switchey(d1, i2) {
   d1 = +d1;
   i2 = i2 | 0;
-  var i3 = 0, d4 = +0, i5 = 0, d6 = +0;
+  var i3 = 0, d4 = +0;
   switch (d1 | 0) {
    case 0:
-    i3 = d1 + d1 | 0;
-    d4 = d(Math_max(10, Math_min(5, f())));
-    i5 = i3 + 2 | 0;
-    print(i5);
-    d6 = d4 * 5;
-    return d6;
+    i2 = d1 + d1 | 0;
+    d1 = d(Math_max(10, Math_min(5, f())));
+    i3 = i2 + 2 | 0;
+    print(i3);
+    d4 = d1 * 5;
+    return d4;
    case 1:
     return 20;
   }