Merge branch 'incoming'

2 files changed, 20 insertions, 1 deletions

diff --git a/tools/eliminator/eliminator-test-output.js b/tools/eliminator/eliminator-test-output.js
index 01f092d5..37a5d104 100644
--- a/tools/eliminator/eliminator-test-output.js
+++ b/tools/eliminator/eliminator-test-output.js
@@ -6140,4 +6140,11 @@ function phi() {
   }
   var $10;
 }
+function intoCond() {
+  var $115 = 22;
+  var $NumWords = __ZN4llvm15BitstreamCursor4ReadEj($117, 32);
+  if (($115 | 0) != 0) {
+    HEAP32[$115 >> 2] = $NumWords;
+  }
+}
 
diff --git a/tools/eliminator/eliminator-test.js b/tools/eliminator/eliminator-test.js
index 8b376305..32bb9d5b 100644
--- a/tools/eliminator/eliminator-test.js
+++ b/tools/eliminator/eliminator-test.js
@@ -8838,5 +8838,17 @@ function phi() {
   }
   var $10;
 }
-// EMSCRIPTEN_GENERATED_FUNCTIONS: ["a", "b", "c", "f", "g", "h", "py", "r", "t", "f2", "f3", "llvm3_1", "_inflate", "_malloc", "_mallocNoU", "asm", "phi"]
+function intoCond() {
+  var $115 = 22;
+  var $499 = __ZN4llvm15BitstreamCursor4ReadEj($117, 32);
+  var $NumWords = $499;
+  var $500 = $115;
+  var $501 = ($500 | 0) != 0;
+  if ($501) {
+    var $503 = $NumWords;
+    var $504 = $115;
+    HEAP32[$504 >> 2] = $503;
+  }
+}
+// EMSCRIPTEN_GENERATED_FUNCTIONS: ["a", "b", "c", "f", "g", "h", "py", "r", "t", "f2", "f3", "llvm3_1", "_inflate", "_malloc", "_mallocNoU", "asm", "phi", "intoCond"]