don't needlessly add empty nodes in asm normalization/denormalization

1 files changed, 14 insertions, 9 deletions

diff --git a/tools/js-optimizer.js b/tools/js-optimizer.js
index d41fb382..81bf8824 100644
--- a/tools/js-optimizer.js
+++ b/tools/js-optimizer.js
@@ -1710,6 +1710,11 @@ function denormalizeAsm(func, data) {
       if (!isEmptyNode(stats[i])) break;
     }
   }
+  // calculate variable definitions
+  var varDefs = [];
+  for (var v in data.vars) {
+    varDefs.push(makeAsmVarDef(v, data.vars[v]));
+  }
   // each param needs a line; reuse emptyNodes as much as we can
   var numParams = 0;
   for (var i in data.params) numParams++;
@@ -1718,26 +1723,21 @@ function denormalizeAsm(func, data) {
     if (!isEmptyNode(stats[emptyNodes])) break;
     emptyNodes++;
   }
-  var neededEmptyNodes = numParams + 1; // params plus one big var
+  var neededEmptyNodes = numParams + (varDefs.length ? 1 : 0); // params plus one big var if there are vars
   if (neededEmptyNodes > emptyNodes) {
     var args = [0, 0];
     for (var i = 0; i < neededEmptyNodes - emptyNodes; i++) args[i+2] = 0;
     stats.splice.apply(stats, args);
+  } else if (neededEmptyNodes < emptyNodes) {
+    stats.splice(0, emptyNodes - neededEmptyNodes);
   }
   // add param coercions
   var next = 0;
   func[2].forEach(function(param) {
     stats[next++] = ['stat', ['assign', true, ['name', param], makeAsmCoercion(['name', param], data.params[param])]];
   });
-  // add variable definitions
-  var varDefs = [];
-  for (var v in data.vars) {
-    varDefs.push(makeAsmVarDef(v, data.vars[v]));
-  }
   if (varDefs.length) {
     stats[next] = ['var', varDefs];
-  } else {
-    stats[next] = emptyNode();
   }
   if (data.inlines.length > 0) {
     var i = 0;
@@ -5308,9 +5308,14 @@ if (extraInfoStart > 0) extraInfo = JSON.parse(src.substr(extraInfoStart + 14));
 
 
 arguments_.slice(1).forEach(function(arg) {
+  //traverse(ast, function(node) {
+  //  if (node[0] === 'defun' && node[1] === 'copyTempFloat') printErr('pre ' + JSON.stringify(node, null, ' '));
+  //});
   passes[arg](ast);
+  //var func;
   //traverse(ast, function(node) {
-  //  if (isEmptyNode(node)) throw 'empty node after ' + arg;
+  //  if (node[0] === 'defun') func = node;
+  //  if (isEmptyNode(node)) throw 'empty node after ' + arg + ', in ' + func[1];
   //});
 });
 if (asm && last) {