From 9bf835df2c5284341ed8d20f89e7960bf91bb339 Mon Sep 17 00:00:00 2001
From: Alon Zakai <alonzakai@gmail.com>
Date: Mon, 7 Jan 2013 16:51:27 -0800
Subject: fix asm relooper bug

---
 src/relooper/Relooper.cpp | 6 +++++-
 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:
-- 
cgit v1.2.3-18-g5258