Merge remote-tracking branch 'upstream/incoming' into source-maps

Conflicts:
	emcc
	tools/js-optimizer.js
	tools/js_optimizer.py

1 files changed, 41 insertions, 41 deletions

diff --git a/tools/test-js-optimizer-asm-last-output.js b/tools/test-js-optimizer-asm-last-output.js
index 1dacd0cd..cbc0a4d3 100644
--- a/tools/test-js-optimizer-asm-last-output.js
+++ b/tools/test-js-optimizer-asm-last-output.js
@@ -1,46 +1,46 @@
 function finall(x) {
-  x = +x;
-  var a = 5.0;
-  a = +x;
-  a = 17;
-  a = 44.0;
-  a = 44.0;
-  a = 44.9;
-  a = 1278.0e3;
-  a = 12.0e10;
-  a = -x;
-  a = -17;
-  a = -44;
-  a = -44;
-  a = -44.9;
-  a = -1278e3;
-  a = -12e10;
-  a = +-x;
-  a = -17.0;
-  a = -44.0;
-  a = -44.0;
-  a = -44.9;
-  a = -1278.0e3;
-  a = -12.0e10;
-  a = 9223372036854776000.0;
-  a = -9223372036854776000.0;
-  a = -9223372036854776000.0;
-  a = -0x8000000000000000;
-  a = 999999984306749400.0;
-  a = -999999984306749400.0;
-  a = -999999984306749400.0;
-  a = -0xde0b6b000000000;
-  return 12.0e10;
+ x = +x;
+ var a = 5.0;
+ a = +x;
+ a = 17;
+ a = 44.0;
+ a = 44.0;
+ a = 44.9;
+ a = 1278.0e3;
+ a = 12.0e10;
+ a = -x;
+ a = -17;
+ a = -44;
+ a = -44;
+ a = -44.9;
+ a = -1278e3;
+ a = -12e10;
+ a = +-x;
+ a = -17.0;
+ a = -44.0;
+ a = -44.0;
+ a = -44.9;
+ a = -1278.0e3;
+ a = -12.0e10;
+ a = 9223372036854776000.0;
+ a = -9223372036854776000.0;
+ a = -9223372036854776000.0;
+ a = -0x8000000000000000;
+ a = 999999984306749400.0;
+ a = -999999984306749400.0;
+ a = -999999984306749400.0;
+ a = -0xde0b6b000000000;
+ return 12.0e10;
 }
 function looop() {
-  do {
-    do_it();
-  } while (!condition());
-  do {
-    do_it();
-  } while (a <= b);
-  do {
-    do_it();
-  } while (x());
+ do {
+  do_it();
+ } while (!condition());
+ do {
+  do_it();
+ } while (a <= b);
+ do {
+  do_it();
+ } while (x());
 }