Merge branch 'master' into llvmsvn

4 files changed, 22 insertions, 6 deletions

diff --git a/tests/runner.py b/tests/runner.py
index 6cdade96..1a79da7c 100755
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -6097,6 +6097,7 @@ elif 'benchmark' in str(sys.argv):
     pass
   finally:
     os.chdir(d)
+  fingerprint.append('llvm: ' + LLVM_ROOT)
   print 'Running Emscripten benchmarks... [ %s ]' % ' | '.join(fingerprint)
 
   sys.argv = filter(lambda x: x != 'benchmark', sys.argv)
diff --git a/tools/eliminator/eliminator-test-output.js b/tools/eliminator/eliminator-test-output.js
index d914a5da..aac21e87 100644
--- a/tools/eliminator/eliminator-test-output.js
+++ b/tools/eliminator/eliminator-test-output.js
@@ -117,4 +117,13 @@ function f3($s, $tree, $k) {
   }
   HEAP32[($s + 2908 + ($storemerge_in << 2) | 0) >> 2] = $0;
 }
-// EMSCRIPTEN_GENERATED_FUNCTIONS: ["f", "g", "h", "py", "r", "t", "f2", "f3"]
+function llvm3_1() {
+  while (check()) {
+    if ($curri_01 % $zj_0 == 0) {
+      break;
+    }
+    var $j_0 = $aj_0 + 1;
+    run($j_0 / 2);
+  }
+}
+// EMSCRIPTEN_GENERATED_FUNCTIONS: ["f", "g", "h", "py", "r", "t", "f2", "f3", "llvm3_1"]
diff --git a/tools/eliminator/eliminator-test.js b/tools/eliminator/eliminator-test.js
index 35bed0bb..55f74d67 100644
--- a/tools/eliminator/eliminator-test.js
+++ b/tools/eliminator/eliminator-test.js
@@ -130,5 +130,14 @@ function f3($s, $tree, $k) {
   }
   HEAP32[($s + 2908 + ($storemerge_in << 2) | 0) >> 2] = $0;
 }
-// EMSCRIPTEN_GENERATED_FUNCTIONS: ["f", "g", "h", "py", "r", "t", "f2", "f3"]
-
+function llvm3_1() {
+  while (check()) {
+    var $inc = $aj_0 + 1;
+    if ($curri_01 % $zj_0 == 0) {
+      break;
+    }
+    var $j_0 = $inc;
+    run($j_0 / 2);
+  }
+}
+// EMSCRIPTEN_GENERATED_FUNCTIONS: ["f", "g", "h", "py", "r", "t", "f2", "f3", "llvm3_1"]
diff --git a/tools/eliminator/eliminator.coffee b/tools/eliminator/eliminator.coffee
index b78a5a7e..ba91aa89 100644
--- a/tools/eliminator/eliminator.coffee
+++ b/tools/eliminator/eliminator.coffee
@@ -49,9 +49,6 @@ NODES_WITHOUT_SIDE_EFFECTS =
 # Nodes which may break control flow. Moving a variable beyond them may have
 # side effects.
 CONTROL_FLOW_NODES =
-  return: true
-  break: true
-  continue: true
   new: true
   throw: true
   call: true