diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2012-12-31 11:56:53 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2012-12-31 11:56:53 -0800 |
| commit | 2325baf34e144586d71251f31c01c7f2abfdb8b7 (patch) | |
| tree | 6dec7e37e75040034d443786d4701e62b38a4d6d /tools/eliminator | |
| parent | 8aa6919b7acf0b4034735ac7ee597e946fefaf4d (diff) | |
| parent | a55c2a24a50a93fcf9035eb2a809d13d3a8d3555 (diff) | |
Merge branch 'incoming' into asm_js
Conflicts:
src/library_browser.js
Diffstat (limited to 'tools/eliminator')
| -rw-r--r-- | tools/eliminator/eliminator-test-output.js | 7 | ||||
| -rw-r--r-- | tools/eliminator/eliminator-test.js | 14 |
2 files changed, 20 insertions, 1 deletions
diff --git a/tools/eliminator/eliminator-test-output.js b/tools/eliminator/eliminator-test-output.js index 0d60d305..a005a0a5 100644 --- a/tools/eliminator/eliminator-test-output.js +++ b/tools/eliminator/eliminator-test-output.js @@ -6148,4 +6148,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 3d71c210..13ecab59 100644 --- a/tools/eliminator/eliminator-test.js +++ b/tools/eliminator/eliminator-test.js @@ -8847,5 +8847,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"] |