diff options
author | Alon Zakai <alonzakai@gmail.com> | 2013-01-07 16:51:27 -0800 |
---|---|---|
committer | Alon Zakai <alonzakai@gmail.com> | 2013-01-07 16:51:27 -0800 |
commit | 9bf835df2c5284341ed8d20f89e7960bf91bb339 (patch) | |
tree | a99ed45926e786c30906718c6183a2cf9b080540 | |
parent | fe0d110de9ed7eaf58a321b4be66b89bb951abc9 (diff) |
fix asm relooper bug1.2.2
-rw-r--r-- | src/relooper/Relooper.cpp | 6 | ||||
-rw-r--r-- | tools/shared.py | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/relooper/Relooper.cpp b/src/relooper/Relooper.cpp index fe151364..ae8577b1 100644 --- a/src/relooper/Relooper.cpp +++ b/src/relooper/Relooper.cpp @@ -273,7 +273,11 @@ void MultipleShape::Render(bool InLoop) { RenderLoopPrefix(); bool First = true; for (BlockShapeMap::iterator iter = InnerMap.begin(); iter != InnerMap.end(); iter++) { - PrintIndented("%sif (label%s == %d) {\n", First ? "" : "else ", AsmJS ? "|0" : "", iter->first->Id); + if (AsmJS) { + PrintIndented("%sif ((label|0) == %d) {\n", First ? "" : "else ", iter->first->Id); + } else { + PrintIndented("%sif (label == %d) {\n", First ? "" : "else ", iter->first->Id); + } First = false; Indenter::Indent(); iter->second->Render(InLoop); diff --git a/tools/shared.py b/tools/shared.py index d51312dc..1b97e166 100644 --- a/tools/shared.py +++ b/tools/shared.py @@ -172,7 +172,7 @@ def check_node_version(): # we re-check sanity when the settings are changed) # We also re-check sanity and clear the cache when the version changes -EMSCRIPTEN_VERSION = '1.2.1' +EMSCRIPTEN_VERSION = '1.2.2' def check_sanity(force=False): try: |