Merge pull request #2038 from rfk/rfk/fix-normalize-asm

Fix a param-handling bug in normalizeAsm

3 files changed, 11 insertions, 0 deletions

diff --git a/tools/js-optimizer.js b/tools/js-optimizer.js
index 6d65f3e7..d604f546 100644
--- a/tools/js-optimizer.js
+++ b/tools/js-optimizer.js
@@ -1603,6 +1603,7 @@ function normalizeAsm(func) {
     node = node[1];
     var name = node[2][1];
     if (func[2] && func[2].indexOf(name) < 0) break; // not an assign into a parameter, but a global
+    if (name in data.params) break; // already done that param, must be starting function body
     data.params[name] = detectAsmCoercion(node[3]);
     stats[i] = emptyNode();
     i++;
diff --git a/tools/test-js-optimizer-asm-regs-min-output.js b/tools/test-js-optimizer-asm-regs-min-output.js
index 3955e48a..748b8e0a 100644
--- a/tools/test-js-optimizer-asm-regs-min-output.js
+++ b/tools/test-js-optimizer-asm-regs-min-output.js
@@ -33,4 +33,9 @@ function cl(b) {
  a(c);
  i1(b);
 }
+function cl(b) {
+ b = b | 0;
+ b = b + 4;
+ a(b);
+}
 
diff --git a/tools/test-js-optimizer-asm-regs-min.js b/tools/test-js-optimizer-asm-regs-min.js
index a5b9427e..65d8d429 100644
--- a/tools/test-js-optimizer-asm-regs-min.js
+++ b/tools/test-js-optimizer-asm-regs-min.js
@@ -33,5 +33,10 @@ function collideLocal(i1) {
  aGlobal(a); // multiple collisions, a and i1
  bGlobal(i1);
 }
+function collideLocal(i1) {
+ i1 = i1 | 0;
+ i1 = i1 + 4; // statement is of similar shape to a param coercion
+ aGlobal(i1);
+}
 // EMSCRIPTEN_GENERATED_FUNCTIONS
 // EXTRA_INFO: { "names": ["a", "b", "c", "d", "e", "f", "g", "h", "i", "i1", "cl"], "globals": { "aGlobal": "a", "bGlobal": "i1", "collideLocal": "cl" } }