3 files changed, 20 insertions, 2 deletions
diff --git a/tools/eliminator/eliminator-test-output.js b/tools/eliminator/eliminator-test-output.js
index cc164f57..0d60d305 100644
--- a/tools/eliminator/eliminator-test-output.js
+++ b/tools/eliminator/eliminator-test-output.js
@@ -6140,4 +6140,12 @@ function asm(x, y) {
   b = a * a;
   fleefl(b | 0, a | 0);
 }
+function phi() {
+  if (wat()) {
+    var $10 = 1;
+  } else {
+    var $10 = (_init_mparams() | 0) != 0;
+  }
+  var $10;
+}
 
diff --git a/tools/eliminator/eliminator-test.js b/tools/eliminator/eliminator-test.js
index 07a41d71..3d71c210 100644
--- a/tools/eliminator/eliminator-test.js
+++ b/tools/eliminator/eliminator-test.js
@@ -8837,5 +8837,15 @@ function asm(x, y) { // asm-style code, without special asm requested so will no
   b = a*a;
   fleefl(b|0, a|0);
 }
-// EMSCRIPTEN_GENERATED_FUNCTIONS: ["a", "b", "c", "f", "g", "h", "py", "r", "t", "f2", "f3", "llvm3_1", "_inflate", "_malloc", "_mallocNoU", "asm"]
+function phi() {
+  if (wat()) {
+    var $10 = 1;
+  } else {
+    var $7=_init_mparams();
+    var $8=(($7)|0)!=0;
+    var $10 = $8;
+  }
+  var $10;
+}
+// EMSCRIPTEN_GENERATED_FUNCTIONS: ["a", "b", "c", "f", "g", "h", "py", "r", "t", "f2", "f3", "llvm3_1", "_inflate", "_malloc", "_mallocNoU", "asm", "phi"]
 
diff --git a/tools/js-optimizer.js b/tools/js-optimizer.js
index e6b945a2..c463970f 100644
--- a/tools/js-optimizer.js
+++ b/tools/js-optimizer.js
@@ -1652,7 +1652,7 @@ function eliminate(ast, memSafe, asm) {
     for (var name in locals) {
       if (definitions[name] == 1 && uses[name] == 1) {
         potentials[name] = 1;
-      } else if (uses[name] == 0) {
+      } else if (uses[name] == 0 && (!definitions[name] || definitions[name] <= 1)) { // no uses, no def or 1 def (cannot operate on phis, and the llvm optimizer will remove unneeded phis anyhow)
         var hasSideEffects = false;
         if (values[name]) {
           traverse(values[name], function(node, type) {