diff --git a/test/optimizer/test-js-optimizer-asm-last-output.js b/test/optimizer/test-js-optimizer-asm-last-output.js
deleted file mode 100644
index f08f38c67f5b4..0000000000000
--- a/test/optimizer/test-js-optimizer-asm-last-output.js
+++ /dev/null
@@ -1,108 +0,0 @@
-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 = 281474976710655.0;
- a = 999999984306749400.0;
- a = -999999984306749400.0;
- a = -999999984306749400.0;
- a = -0xde0b6b000000000;
- a = 1.1234567890123457e+21;
- f(g() | 0);
- x = 1.7976931348623157e+308;
- a = 9007199254740992;
- a = 9007199254740992;
- a = 9007199254740994;
- return 12.0e10;
-}
-function looop() {
- do do_it(); while (!condition());
- do do_it(); while (!(a > b));
- do do_it(); while (x());
- while (1) {
-  do_it();
-  if (a()) continue;
-  if (!x()) break;
- }
- do {
-  do_it();
-  do if (a()) continue; while (b());
- } while (x());
- do {
-  do_it();
-  while (b()) if (a()) continue;
- } while (x());
- X : while (1) {
-  do_it();
-  while (b()) if (a()) continue X;
-  if (!x()) break;
- }
- do blah(); while (!shah());
- a = b;
- LABELED : while (1) {
-  blah();
-  if (shah()) {
-   c = d;
-   break;
-  }
- }
- while (1) {
-  blah();
-  if (check) break;
-  if (shah()) {
-   e = f;
-   break;
-  }
- }
- do {
-  blah();
-  while (1) if (check) break;
- } while (!shah());
- g = h;
- if (a) waka();
- if (a) waka(); else wala();
- if (a) if (a) waka(); else wala();
- if (a) {
-  if (a) waka();
- } else other();
- if (a) if (a) waka(); else wala(); else other();
-}
-function conditions() {
- if (HEAP32[$incdec_ptr71_i + 8 >> 2] | 0) shoo();
- if (x == 0) y();
- if (!x) y();
- if (!y) z();
- if (x != 0) y();
- if (x) y();
- if (y) z();
- if (x) y();
- if (!x) y();
- if (!(s() | 0)) z();
- if (x + 4 | 0) y();
- if (x & 4) y();
-}
-
diff --git a/test/optimizer/test-js-optimizer-asm-last-output2.js b/test/optimizer/test-js-optimizer-asm-last-output2.js
deleted file mode 100644
index a34e2dbd79a8c..0000000000000
--- a/test/optimizer/test-js-optimizer-asm-last-output2.js
+++ /dev/null
@@ -1,108 +0,0 @@
-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 = 9223372036854775808.0;
- a = -9223372036854775808.0;
- a = -9223372036854775808.0;
- a = -9223372036854775808;
- a = 281474976710655.0;
- a = 999999984306749440.0;
- a = -999999984306749440.0;
- a = -999999984306749440.0;
- a = -999999984306749440;
- a = 1123456789012345651200.0;
- f(g() | 0);
- x = 1797693134862315708145274e284;
- a = 9007199254740992;
- a = 9007199254740992;
- a = 9007199254740994;
- return 12.0e10;
-}
-function looop() {
- do do_it(); while (!condition());
- do do_it(); while (!(a > b));
- do do_it(); while (x());
- while (1) {
-  do_it();
-  if (a()) continue;
-  if (!x()) break;
- }
- do {
-  do_it();
-  do if (a()) continue; while (b());
- } while (x());
- do {
-  do_it();
-  while (b()) if (a()) continue;
- } while (x());
- X : while (1) {
-  do_it();
-  while (b()) if (a()) continue X;
-  if (!x()) break;
- }
- do blah(); while (!shah());
- a = b;
- LABELED : while (1) {
-  blah();
-  if (shah()) {
-   c = d;
-   break;
-  }
- }
- while (1) {
-  blah();
-  if (check) break;
-  if (shah()) {
-   e = f;
-   break;
-  }
- }
- do {
-  blah();
-  while (1) if (check) break;
- } while (!shah());
- g = h;
- if (a) waka();
- if (a) waka(); else wala();
- if (a) if (a) waka(); else wala();
- if (a) {
-  if (a) waka();
- } else other();
- if (a) if (a) waka(); else wala(); else other();
-}
-function conditions() {
- if (HEAP32[$incdec_ptr71_i + 8 >> 2] | 0) shoo();
- if (x == 0) y();
- if (!x) y();
- if (!y) z();
- if (x != 0) y();
- if (x) y();
- if (y) z();
- if (x) y();
- if (!x) y();
- if (!(s() | 0)) z();
- if (x + 4 | 0) y();
- if (x & 4) y();
-}
-
diff --git a/test/optimizer/test-js-optimizer-asm-last-output3.js b/test/optimizer/test-js-optimizer-asm-last-output3.js
deleted file mode 100644
index e68f1d20b9855..0000000000000
--- a/test/optimizer/test-js-optimizer-asm-last-output3.js
+++ /dev/null
@@ -1,108 +0,0 @@
-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 = 9223372036854775808.0;
- a = -9223372036854775808.0;
- a = -9223372036854775808.0;
- a = -9223372036854775808;
- a = 281474976710655.0;
- a = 999999984306749440.0;
- a = -999999984306749440.0;
- a = -999999984306749440.0;
- a = -999999984306749440;
- a = 11234567890123457.0e5;
- f(g() | 0);
- x = 17976931348623157e292;
- a = 9007199254740992;
- a = 9007199254740992;
- a = 9007199254740994;
- return 12.0e10;
-}
-function looop() {
- do do_it(); while (!condition());
- do do_it(); while (!(a > b));
- do do_it(); while (x());
- while (1) {
-  do_it();
-  if (a()) continue;
-  if (!x()) break;
- }
- do {
-  do_it();
-  do if (a()) continue; while (b());
- } while (x());
- do {
-  do_it();
-  while (b()) if (a()) continue;
- } while (x());
- X : while (1) {
-  do_it();
-  while (b()) if (a()) continue X;
-  if (!x()) break;
- }
- do blah(); while (!shah());
- a = b;
- LABELED : while (1) {
-  blah();
-  if (shah()) {
-   c = d;
-   break;
-  }
- }
- while (1) {
-  blah();
-  if (check) break;
-  if (shah()) {
-   e = f;
-   break;
-  }
- }
- do {
-  blah();
-  while (1) if (check) break;
- } while (!shah());
- g = h;
- if (a) waka();
- if (a) waka(); else wala();
- if (a) if (a) waka(); else wala();
- if (a) {
-  if (a) waka();
- } else other();
- if (a) if (a) waka(); else wala(); else other();
-}
-function conditions() {
- if (HEAP32[$incdec_ptr71_i + 8 >> 2] | 0) shoo();
- if (x == 0) y();
- if (!x) y();
- if (!y) z();
- if (x != 0) y();
- if (x) y();
- if (y) z();
- if (x) y();
- if (!x) y();
- if (!(s() | 0)) z();
- if (x + 4 | 0) y();
- if (x & 4) y();
-}
-
diff --git a/test/optimizer/test-js-optimizer-asm-last.js b/test/optimizer/test-js-optimizer-asm-last.js
deleted file mode 100644
index 4241716acd211..0000000000000
--- a/test/optimizer/test-js-optimizer-asm-last.js
+++ /dev/null
@@ -1,148 +0,0 @@
-function finall(x) {
- x = +x;
- var a = +5;
- a = +x;
- a = 17;
- a = +44;
- a = +44.0;
- a = +44.9;
- a = +12.78e5;
- a = +12e10;
- a = -x;
- a = -17;
- a = -44;
- a = -44.0;
- a = -44.9;
- a = -12.78e5;
- a = -12e10;
- a = +-x;
- a = +-17;
- a = +-44;
- a = +-44.0;
- a = +-44.9;
- a = +-12.78e5;
- a = +-12e10;
- a = +0x8000000000000000;
- a = +-0x8000000000000000;
- a = -+0x8000000000000000;
- a = -0x8000000000000000;
- a = +0xffffffffffff;
- a = +0xde0b6b000000000;
- a = +-0xde0b6b000000000;
- a = -+0xde0b6b000000000;
- a = -0xde0b6b000000000;
- a = +0x3ce7184d470dd60000;
- f(g() & -1);
- x = 1.7976931348623157e+308;
- a = 9007199254740992; // 2^53, the largest integer that can be represented in a double such that all smaller integers are also representable.
- a = 9007199254740993; // 2^53 + 1 cannot be represented as double.
- a = 9007199254740994; // This is again representable as double.
- return +12e10;
-}
-function looop() {
- while (1) {
-  do_it();
-  if (condition()) {
-   break;
-  }
- }
- while (1) {
-  do_it();
-  if (a > b) {
-   break;
-  }
- }
- while (1) {
-  do_it();
-  if (!x()) {
-   break;
-  }
- }
- while (1) {
-  do_it();
-  if (a()) continue; // we cannot move to do-while, continue will hit the while check
-  if (!x()) {
-   break;
-  }
- }
- while (1) {
-  do_it();
-  do {
-    if (a()) continue; // ok to optimize, continue is not for us
-  } while (b());
-  if (!x()) {
-   break;
-  }
- }
- while (1) {
-  do_it();
-  while (b()) {
-    if (a()) continue; // also ok to optimize, continue is not for us
-  }
-  if (!x()) {
-   break;
-  }
- }
- X: while (1) {
-  do_it();
-  while (b()) {
-    if (a()) continue X; // not ok to optimize
-  }
-  if (!x()) {
-   break;
-  }
- }
- while (1) {
-  blah();
-  if (shah()) {
-   a = b;
-   break;
-  }
- }
- LABELED: while (1) {
-  blah();
-  if (shah()) {
-   c = d;
-   break;
-  }
- }
- while (1) {
-  blah();
-  if (check) break; // prevents optimization
-  if (shah()) {
-   e = f;
-   break;
-  }
- }
- while (1) {
-  blah();
-  while (1) {
-   if (check) break; // safe to optimize
-  }
-  if (shah()) {
-   g = h;
-   break;
-  }
- }
- if (a) { waka(); }
- if (a) { waka(); } else { wala(); }
- if (a) { if (a) { waka(); } else { wala(); } }
- if (a) { if (a) { waka(); } } else { other(); }
- if (a) { if (a) { waka(); } else { wala(); } } else { other(); }
-}
-function conditions() {
- if (!((HEAP32[$incdec_ptr71_i + 8 >> 2] | 0) == 0)) {
-  shoo();
- }
- if (x == 0) y();
- if ((x | 0) == 0) y();
- if (0 == (y | 0)) z();
- if (x != 0) y();
- if ((x | 0) != 0) y();
- if (0 != (y | 0)) z();
- if (!((x | 0) == 0)) y();
- if (!(0 != (x | 0))) y();
- if (!(s() | 0)) z();
- if ((x + 4 | 0) != 0) y();
- if ((x & 4 | 0) != 0) y();
-}
diff --git a/test/optimizer/test-js-optimizer-asm-output.js b/test/optimizer/test-js-optimizer-asm-output.js
deleted file mode 100644
index ba2e9c5cad435..0000000000000
--- a/test/optimizer/test-js-optimizer-asm-output.js
+++ /dev/null
@@ -1,261 +0,0 @@
-function expr() {
- if (!($0 < $1)) print("hi");
-}
-function loopy() {
- $while_body$2 : while (1) {
-  $ok = 1;
-  $for_cond$4 : while (1) {
-   if ($ok) break $for_cond$4;
-   var $inc = $ok + 1;
-   if ($inc == 9999) break $while_body$2;
-  }
-  continue $while_body$2;
- }
- next();
- b$while_body$2 : while (1) {
-  $ok = 1;
-  b$for_cond$4 : while (1) {
-   if ($ok) break b$for_cond$4;
-   var $inc = $ok + 1;
-  }
-  continue b$while_body$2;
- }
- next();
- $once : do {
-  if (!$ok) break $once;
-  something();
- } while (0);
- next();
- b$once : do {
-  while (more()) {
-   if (!$ok) break b$once;
-  }
-  something();
- } while (0);
- next();
- c$once : do {
-  something();
- } while (0);
-}
-function bits() {
- print(($s & 65535) + ((($f & 65535) << 16 >> 16) * (($f & 65535) << 16 >> 16) | 0) % 256 & 65535);
- z(HEAP32[$id + 40 >> 2]);
- z($f << 2);
- z($f | 255);
- z($f & 255);
- z($f ^ 1);
- z($f << 2);
- z(($f | 0) * 100 << 2);
- z(($f | 0) % 2 | 255);
- z(($f | 0) / 55 & 255);
- z($f - 22 ^ 1);
- z($f + 15 << 2);
-}
-function maths() {
- check(17);
- check(95);
- __ZN6b2Vec2C1Ev($this1 + 20 + 8 + 8 + 8 + 8 + 8 + 8 + 8 | 0);
-}
-function hoisting() {
- if ($i < $N) {
-  label = 2;
- }
- if (label == 2) {
-  callOther();
- }
- pause(1);
- if ($i < $N) {
-  label = 2;
- } else {
-  label = 3;
- }
- $for_body3$$for_end$5 : do {
-  if (label == 2) {
-   callOther();
-  }
- } while (0);
- pause(2);
- if ($i < $N) {
-  label = 2;
- } else {
-  label = 3;
- }
- cheez : do {
-  if (label == 2) {
-   if (callOther()) break cheez;
-  }
- } while (0);
- pause(3);
- if ($i < $N) {
-  label = 2;
- } else {
-  label = 3;
- }
- if (label == 2) {
-  callOther();
- }
- pause(4);
- if ($i < $N) {
-  label = 2;
- } else {
-  label = 3;
- }
- if (label == 2) {
-  callOther();
- } else if (label == 3) {
-  somethingElse();
- }
- pause(5);
- if ($i < $N) {
-  label = 2;
- } else {
-  label = 3;
- }
- if (label == 55) {
-  callOther();
- } else if (label == 3) {
-  somethingElse();
- }
- pause(6);
- if ($i < $N) {
-  label = 2;
- } else {
-  label = 3;
- }
- if (label == 3) {
-  somethingElse();
- }
- pause(7);
- free : while (1) {
-  if ($i < $N) {
-   label = 2;
-  } else {
-   label = 3;
-   break;
-  }
-  if (label == 2) {
-   somethingElse();
-  }
-  if ($i < $N) {
-   label = 2;
-  } else {
-   label = 3;
-  }
-  if (label == 2) {
-   somethingElse();
-  }
-  nothing();
- }
- pause(8);
- var $cmp95 = $69 == -1;
- if ($cmp95) {
-  label = 35;
- } else {
-  label = 38;
- }
- $if_then96$$if_end110thread_pre_split$48 : do {
-  if (label == 35) {
-   if (!$cmp103) {
-    label = 38;
-    break $if_then96$$if_end110thread_pre_split$48;
-   }
-   if (!$cmp106) {
-    label = 38;
-    break $if_then96$$if_end110thread_pre_split$48;
-   }
-   label = 39;
-   break $if_then96$$if_end110thread_pre_split$48;
-  }
- } while (0);
- $if_end110$$if_end110thread_pre_split$52 : do {
-  if (label == 38) {
-   var $79 = $_pr6;
-  }
- } while (0);
- pause(9);
- var $cmp70 = ($call69 | 0) != 0;
- if ($cmp70) {
-  label = 40;
- } else {
-  label = 41;
- }
- $if_then72$$if_end73$126 : do {
-  if (label == 40) {} else if (label == 41) {}
- } while (0);
- pause(10);
- while (check()) {
-  if ($i < $N) {
-   label = 2;
-  } else {
-   label = 3;
-  }
-  if (label == 2) {
-   callOther();
-   break;
-  } else if (label == 3) {
-   somethingElse();
-  }
-  if ($i1 < $N) {
-   label = 2;
-  } else {
-   label = 3;
-  }
-  if (label == 2) {
-   callOther();
-   continue;
-  } else if (label == 3) {
-   somethingElse();
-  }
-  if ($i2 < $N) {
-   label = 2;
-  } else {
-   label = 3;
-  }
-  if (label == 2) {
-   callOther();
-  } else if (label == 3) {
-   somethingElse();
-   break;
-  }
-  if ($i3 < $N) {
-   label = 2;
-  } else {
-   label = 3;
-  }
-  if (label == 2) {
-   callOther();
-  } else if (label == 3) {
-   somethingElse();
-   continue;
-  }
-  if ($i4 < $N) {
-   label = 2;
-  } else {
-   label = 3;
-  }
-  if (label == 2) {
-   callOther();
-   break;
-  } else if (label == 3) {
-   somethingElse();
-   continue;
-  }
- }
-}
-function toZero(x, y) {
- x = x | 0;
- y = +y;
- if (x) a();
- if (y) a();
- while (x) a();
- while (y) a();
- do {
-  a();
- } while (x);
- do {
-  a();
- } while (y);
- x ? a() : b();
- y ? a() : b();
-}
-
diff --git a/test/optimizer/test-js-optimizer-asm-relocate-output.js b/test/optimizer/test-js-optimizer-asm-relocate-output.js
deleted file mode 100644
index 2f8294c5d84c2..0000000000000
--- a/test/optimizer/test-js-optimizer-asm-relocate-output.js
+++ /dev/null
@@ -1,9 +0,0 @@
-function leaveMeAlone(c) {}
-function fixed(a, b) {}
-function a(x, y) {
- fixed(34, 4);
- fixed(34 | 0, 102 | 0);
- leaveMeAlone(2 + x, 33 + y);
- leaveMeAlone(x | 0, 33 + y | 0);
-}
-
diff --git a/test/optimizer/test-js-optimizer-asm-relocate.js b/test/optimizer/test-js-optimizer-asm-relocate.js
deleted file mode 100644
index 8dcc1da683135..0000000000000
--- a/test/optimizer/test-js-optimizer-asm-relocate.js
+++ /dev/null
@@ -1,11 +0,0 @@
-function leaveMeAlone(c) {
-}
-function replaceMe(a, b) {
-}
-function a(x, y) {
-  replaceMe(H_BASE + 1, F_BASE_vii + 2);
-  replaceMe(H_BASE + 1 | 0, F_BASE_vi + 2 | 0);
-  leaveMeAlone(F_BASE_vii + x, H_BASE + y);
-  leaveMeAlone(F_BASE_vUNKNOWN + x | 0, H_BASE + y | 0);
-}
-// EXTRA_INFO: { "replacements": { "replaceMe": "fixed" }, "hBase": 33, "fBases": { "vii": 2, "vi": 100, "v": 20 } }
diff --git a/test/optimizer/test-js-optimizer-asm.js b/test/optimizer/test-js-optimizer-asm.js
deleted file mode 100644
index e462fdc10bc1a..0000000000000
--- a/test/optimizer/test-js-optimizer-asm.js
+++ /dev/null
@@ -1,260 +0,0 @@
-function expr() {
- if (!($0 < $1)) print("hi");
-}
-function loopy() {
- $while_body$2: while(1) { 
-  $ok=1;
-  $for_cond$4: while(1) { 
-   if ($ok) break $for_cond$4;
-   var $inc=$ok+1;
-   if ($inc == 9999) break $while_body$2; // this forces a label to remain on the outer loop
-  }
-  continue $while_body$2;
- }
- next();
- b$while_body$2: while(1) { 
-  $ok=1;
-  b$for_cond$4: while(1) {
-   if ($ok) break b$for_cond$4;
-   var $inc=$ok+1;
-  }
-  continue b$while_body$2;
- }
- next();
- $once: do {
-  if (!$ok) break $once; // forces the entire one-time do to remain (but unlabelled)
-  something();
- } while(0);
- next();
- b$once: do {
-  while (more()) {
-   if (!$ok) break b$once; // forces the entire one-time do to remain, with label
-  }
-  something();
- } while(0);
- next();
- c$once: do {
-  something();
- } while(0);
-}
-function bits() {
- print((($s & 65535) + ((($f & 65535) << 16 >> 16) * (($f & 65535) << 16 >> 16) | 0 | 0) % 256 | 0) & 65535);
- z(HEAP32[($id + 40 | 0) >> 2]);
- z(($f | 0) << 2);
- z(($f | 0) | 255);
- z(($f | 0) & 255);
- z(($f | 0) ^ 1);
- z(($f | 0) << 2);
- z((($f | 0) * 100) << 2);
- z((($f | 0) % 2) | 255);
- z((($f | 0) / 55) & 255);
- z((($f | 0) - 22) ^ 1);
- z((($f | 0) + 15) << 2);
-}
-function maths() {
- check(5+12);
- check(90+3+2);
- __ZN6b2Vec2C1Ev(((((((($this1 + 20 | 0 | 0) + 8 | 0) + 8 | 0) + 8 | 0) + 8 | 0) + 8 | 0) + 8 | 0) + 8 | 0);
-}
-function hoisting() {
- if ($i < $N) {
-  label = 2;
- }
- if (label == 2) {
-  callOther();
- }
- pause(1);
- if ($i < $N) {
-  label = 2;
- } else {
-  label = 3;
- }
- $for_body3$$for_end$5 : do {
-  if (label == 2) {
-   callOther();
-  }
- } while (0);
- pause(2);
- if ($i < $N) {
-  label = 2;
- } else {
-  label = 3;
- }
- cheez: do {
-  if (label == 2) {
-   if (callOther()) break cheez;
-  }
- } while (0);
- pause(3);
- if ($i < $N) {
-  label = 2;
- } else {
-  label = 3;
- }
- if (label == 2) {
-  callOther();
- }
- pause(4);
- if ($i < $N) {
-  label = 2;
- } else {
-  label = 3;
- }
- if (label == 2) {
-  callOther();
- } else if (label == 3) {
-  somethingElse();
- }
- pause(5);
- if ($i < $N) {
-  label = 2;
- } else {
-  label = 3;
- }
- if (label == 55) {
-  callOther();
- } else if (label == 3) {
-  somethingElse();
- }
- pause(6);
- if ($i < $N) {
-  label = 2;
- } else {
-  label = 3;
- }
- if (label == 3) {
-  somethingElse();
- }
- pause(7);
- free: while (1) {
-  if ($i < $N) {
-   label = 2;
-  } else {
-   label = 3; // this cannot be removed!
-   break;
-  }
-  if (label == 2) {
-   somethingElse();
-  }
-  if ($i < $N) {
-   label = 2;
-  } else {
-   label = 3; // this can be removed!
-  }
-  if (label == 2) {
-   somethingElse();
-  }
-  nothing();
- }
- pause(8);
- var $cmp95 = $69 == -1;
- if ($cmp95) {
-  label = 35;
- } else {
-  label = 38;
- }
- $if_then96$$if_end110thread_pre_split$48 : do {
-  if (label == 35) {
-   if (!$cmp103) {
-    label = 38;
-    break $if_then96$$if_end110thread_pre_split$48;
-   }
-   if (!$cmp106) {
-    label = 38;
-    break $if_then96$$if_end110thread_pre_split$48;
-   }
-   label = 39;
-   break $if_then96$$if_end110thread_pre_split$48;
-  }
- } while (0);
- $if_end110$$if_end110thread_pre_split$52 : do {
-  if (label == 38) {
-   var $79 = $_pr6;
-  }
- } while (0);
- pause(9);
- var $cmp70 = ($call69 | 0) != 0;
- if ($cmp70) {
-  label = 40;
- } else {
-  label = 41;
- }
- $if_then72$$if_end73$126 : do {
-  if (label == 40) {} else if (label == 41) {}
- } while (0);
- pause(10);
- while(check()) {
-  if ($i < $N) {
-   label = 2;
-  } else {
-   label = 3;
-  }
-  if (label == 2) {
-   callOther();
-   break;
-  } else if (label == 3) {
-   somethingElse();
-  }
-  if ($i1 < $N) {
-   label = 2;
-  } else {
-   label = 3;
-  }
-  if (label == 2) {
-   callOther();
-   continue;
-  } else if (label == 3) {
-   somethingElse();
-  }
-  if ($i2 < $N) {
-   label = 2;
-  } else {
-   label = 3;
-  }
-  if (label == 2) {
-   callOther();
-  } else if (label == 3) {
-   somethingElse();
-   break;
-  }
-  if ($i3 < $N) {
-   label = 2;
-  } else {
-   label = 3;
-  }
-  if (label == 2) {
-   callOther();
-  } else if (label == 3) {
-   somethingElse();
-   continue;
-  }
-  if ($i4 < $N) {
-   label = 2;
-  } else {
-   label = 3;
-  }
-  if (label == 2) {
-   callOther();
-   break;
-  } else if (label == 3) {
-   somethingElse();
-   continue;
-  }
- }
-}
-function toZero(x, y) {
- x = x | 0;
- y = +y;
- if (x != 0) a();
- if (y != 0) a();
- while (x != 0) a();
- while (y != 0) a();
- do {
-  a();
- } while (x != 0);
- do {
-  a();
- } while (y != 0);
- x != 0 ? a() : b();
- y != 0 ? a() : b();
-}
diff --git a/test/optimizer/test-js-optimizer-output.js b/test/optimizer/test-js-optimizer-output.js
deleted file mode 100644
index a565491c268db..0000000000000
--- a/test/optimizer/test-js-optimizer-output.js
+++ /dev/null
@@ -1,306 +0,0 @@
-function expr() {
- if ($0 >= $1) print("hi");
-}
-function loopy() {
- $while_body$2 : while (1) {
-  $ok = 1;
-  $for_cond$4 : while (1) {
-   if ($ok) break $for_cond$4;
-   var $inc = $ok + 1;
-   if ($inc == 9999) break $while_body$2;
-  }
-  continue $while_body$2;
- }
- next();
- b$while_body$2 : while (1) {
-  $ok = 1;
-  b$for_cond$4 : while (1) {
-   if ($ok) break b$for_cond$4;
-   var $inc = $ok + 1;
-  }
-  continue b$while_body$2;
- }
- next();
- $once : do {
-  if (!$ok) break $once;
-  something();
- } while (0);
- next();
- b$once : do {
-  while (more()) {
-   if (!$ok) break b$once;
-  }
-  something();
- } while (0);
- next();
- c$once : do {
-  something();
- } while (0);
-}
-function bits() {
- print(($s & 65535) + ((($f & 65535) << 16 >> 16) * (($f & 65535) << 16 >> 16) | 0) % 256 & 65535);
- z(HEAP32[$id + 40 >> 2]);
- z($f << 2);
- z($f | 255);
- z($f & 255);
- z($f ^ 1);
- z($f << 2);
- z($f * 100 << 2);
- z(($f | 0) % 2 | 255);
- z(($f | 0) / 55 & 255);
- z($f - 22 ^ 1);
- z($f + 15 << 2);
-}
-function maths() {
- check(17);
- check(95);
- __ZN6b2Vec2C1Ev($this1 + 76 | 0);
- __ZN6b2Vec2C1Ev($this1 + 20 + 8 + 8 + 8 + 8 + 8 + 8 + 8 | 0);
-}
-function hoisting() {
- if ($i < $N) {
-  callOther();
- }
- pause(1);
- $for_body3$$for_end$5 : do {
-  if ($i < $N) {
-   while (true) {
-    break $for_body3$$for_end$5;
-   }
-   callOther();
-  }
- } while (0);
- pause(2);
- cheez : do {
-  if ($i < $N) {
-   if (callOther()) break cheez;
-  }
- } while (0);
- pause(3);
- if ($i < $N) {
-  callOther();
- }
- pause(4);
- if ($i < $N) {
-  callOther();
- } else {
-  somethingElse();
- }
- pause(5);
- if ($i < $N) {
-  label = 2;
- } else {
-  somethingElse();
- }
- if (label == 55) {
-  callOther();
- }
- pause(6);
- if ($i >= $N) {
-  somethingElse();
- }
- pause(7);
- free : while (1) {
-  if ($i >= $N) {
-   label = 3;
-   break;
-  }
-  somethingElse();
-  if ($i < $N) {
-   somethingElse();
-  }
-  nothing();
- }
- pause(8);
- var $cmp95 = $69 == -1;
- $if_then96$$if_end110thread_pre_split$48 : do {
-  if ($cmp95) {
-   if (!$cmp103) {
-    label = 38;
-    break $if_then96$$if_end110thread_pre_split$48;
-   }
-   if (!$cmp106) {
-    label = 38;
-    break $if_then96$$if_end110thread_pre_split$48;
-   }
-   label = 39;
-   break $if_then96$$if_end110thread_pre_split$48;
-  }
-  label = 38;
- } while (0);
- $if_end110$$if_end110thread_pre_split$52 : do {
-  if (label == 38) {
-   var $79 = $_pr6;
-  }
- } while (0);
- pause(9);
- var $cmp70 = ($call69 | 0) != 0;
- pause(10);
- while (check()) {
-  if ($i < $N) {
-   callOther();
-   break;
-  }
-  somethingElse();
-  if ($i1 < $N) {
-   callOther();
-   continue;
-  }
-  somethingElse();
-  if ($i2 >= $N) {
-   somethingElse();
-   break;
-  }
-  callOther();
-  if ($i3 >= $N) {
-   somethingElse();
-   continue;
-  }
-  callOther();
-  if ($i4 < $N) {
-   callOther();
-   break;
-  }
-  somethingElse();
-  continue;
- }
-}
-function innerShouldAlsoBeHoisted() {
- function hoisting() {
-  if ($i < $N) {
-   callOther();
-  }
- }
-}
-var FS = {
- absolutePath: (function(relative, base) {
-  if (typeof relative !== "string") return null;
-  if (base === undefined) base = FS.currentPath;
-  if (relative && relative[0] == "/") base = "";
-  var full = base + "/" + relative;
-  var parts = full.split("/").reverse();
-  var absolute = [ "" ];
-  while (parts.length) {
-   var part = parts.pop();
-   if (part == "" || part == ".") {} else if (part == "..") {
-    if (absolute.length > 1) absolute.pop();
-   } else {
-    absolute.push(part);
-   }
-  }
-  return absolute.length == 1 ? "/" : absolute.join("/");
- })
-};
-function sleep() {
- while (Date.now() - start < msec) {}
- return 0;
-}
-function demangle($cmp) {
- $if_then$$lor_lhs_false$2 : do {
-  if (!$cmp) {
-   if (something()) {
-    label = 3;
-    break $if_then$$lor_lhs_false$2;
-   }
-   more();
-   break $if_then$$lor_lhs_false$2;
-  }
-  label = 3;
- } while (0);
- $if_then$$return$6 : do {
-  if (label == 3) {
-   final();
-  }
- } while (0);
-}
-function lua() {
- $5$98 : while (1) {
-  $15$$16$101 : do {
-   if (!$14) {
-    var $17 = $i;
-    var $18 = $3;
-    var $19 = $18 + ($17 << 2) | 0;
-    var $20 = HEAP32[$19 >> 2];
-    var $21 = $20 + 1 | 0;
-    var $22 = HEAP8[$21];
-    var $23 = $22 << 24 >> 24;
-    break $15$$16$101;
-   }
-  } while (0);
- }
- pause();
- if ($1435 == 0) {
-  label = 176;
-  cheez();
- } else if ($1435 != 1) {
-  label = 180;
-  cheez();
- }
- pause();
- if ($1435 == 0) {
-  label = 176;
-  cheez();
- }
-}
-function moreLabels() {
- $for_cond$2 : while (1) {
-  if (!$cmp) {
-   break $for_cond$2;
-  }
-  $if_then$$for_inc$5 : do {
-   if ($cmp1) {
-    break $for_cond$2;
-   }
-   inc();
-  } while (0);
- }
- pause(999);
- $while_body$$while_end$31 : do {
-  if ($cmp3) {
-   var $6 = $5;
-   while (1) {
-    var $6;
-    $iter = $6 + 3;
-    if (FHEAP[$iter + 1] >= $pct_addr) {
-     var $_lcssa = $iter;
-     break $while_body$$while_end$31;
-    }
-    var $6 = $iter;
-   }
-  } else {
-   var $_lcssa = $5;
-  }
- } while (0);
- var $_lcssa;
- cheez();
-}
-function notComps() {
- if (HEAP32[$incdec_ptr71_i + 8 >> 2]) {
-  shoo();
- }
-}
-function tricky() {
- var $conv642 = $conv6374 - (($132 << 16 >> 16 | 0) / 2 & -1) & 65535;
-}
-function asmy() {
- f(HEAPU8[_buf + i6 & 16777215]);
- f(HEAPU8[_buf + i6 & 16777215]);
- f(HEAPU8[_buf + i6 & 16777215] & 1);
- f(HEAPU8[_buf + i6 & 16777215] & 1);
- f(HEAP8[_buf + i6 & 16777215] & 1);
- f(HEAPU8[_buf + i6 & 16777215] & 1);
- f((HEAPU8[_buf + i6 & 16777215] & 1) + i5 | 0);
- f((HEAPU8[_buf + i6 & 16777215] & 1) + i5 | 0);
- f((HEAP8[_buf + i6 & 16777215] & 1) + i5 | 0);
- f((HEAPU8[_buf + i6 & 16777215] & 1) + i5 | 0);
- f(HEAP32[12]);
- f(HEAPU32[12]);
- f(HEAP32[5]);
- f(HEAPU32[5]);
- if ((_sbrk($419 | 0) | 0) == -1) {
-  print("fleefl");
- }
-}
-function dblMax() {
- var x = +1.7976931348623157e+308;
-}
diff --git a/test/optimizer/test-js-optimizer.js b/test/optimizer/test-js-optimizer.js
deleted file mode 100644
index b9a9d36f3d9ac..0000000000000
--- a/test/optimizer/test-js-optimizer.js
+++ /dev/null
@@ -1,408 +0,0 @@
-function expr() {
- if (!($0 < $1)) print("hi");
-}
-function loopy() {
- $while_body$2: while(1) { 
-  $ok=1;
-  $for_cond$4: while(1) { 
-   if ($ok) break $for_cond$4;
-   var $inc=$ok+1;
-   if ($inc == 9999) break $while_body$2; // this forces a label to remain on the outer loop
-  }
-  continue $while_body$2;
- }
- next();
- b$while_body$2: while(1) { 
-  $ok=1;
-  b$for_cond$4: while(1) {
-   if ($ok) break b$for_cond$4;
-   var $inc=$ok+1;
-  }
-  continue b$while_body$2;
- }
- next();
- $once: do {
-  if (!$ok) break $once; // forces the entire one-time do to remain (but unlabelled)
-  something();
- } while(0);
- next();
- b$once: do {
-  while (more()) {
-   if (!$ok) break b$once; // forces the entire one-time do to remain, with label
-  }
-  something();
- } while(0);
- next();
- c$once: do {
-  something();
- } while(0);
-}
-function bits() {
- print((($s & 65535) + ((($f & 65535) << 16 >> 16) * (($f & 65535) << 16 >> 16) | 0 | 0) % 256 | 0) & 65535);
- z(HEAP32[($id + 40 | 0) >> 2]);
- z(($f | 0) << 2);
- z(($f | 0) | 255);
- z(($f | 0) & 255);
- z(($f | 0) ^ 1);
- z(($f | 0) << 2);
- z((($f | 0) * 100) << 2);
- z((($f | 0) % 2) | 255);
- z((($f | 0) / 55) & 255);
- z((($f | 0) - 22) ^ 1);
- z((($f | 0) + 15) << 2);
-}
-function maths() {
- check(5+12);
- check(90+3+2);
- __ZN6b2Vec2C1Ev($this1 + ((((((((20 | 0) + 8 | 0) + 8 | 0) + 8 | 0) + 8 | 0) + 8 | 0) + 8 | 0) + 8 | 0) | 0);
- __ZN6b2Vec2C1Ev(((((((($this1 + 20 | 0 | 0) + 8 | 0) + 8 | 0) + 8 | 0) + 8 | 0) + 8 | 0) + 8 | 0) + 8 | 0);
-}
-function hoisting() {
- if ($i < $N) {
-  label = 2;
- }
- if (label == 2) {
-  callOther();
- }
- pause(1);
- if ($i < $N) {
-  label = 2;
- } else {
-  label = 3;
- }
- $for_body3$$for_end$5 : do {
-  if (label == 2) {
-   while(true) { break $for_body3$$for_end$5 }
-   callOther();
-  }
- } while (0);
- pause(2);
- if ($i < $N) {
-  label = 2;
- } else {
-  label = 3;
- }
- cheez: do {
-  if (label == 2) {
-   if (callOther()) break cheez;
-  }
- } while (0);
- pause(3);
- if ($i < $N) {
-  label = 2;
- } else {
-  label = 3;
- }
- if (label == 2) {
-  callOther();
- }
- pause(4);
- if ($i < $N) {
-  label = 2;
- } else {
-  label = 3;
- }
- if (label == 2) {
-  callOther();
- } else if (label == 3) {
-  somethingElse();
- }
- pause(5);
- if ($i < $N) {
-  label = 2;
- } else {
-  label = 3;
- }
- if (label == 55) {
-  callOther();
- } else if (label == 3) {
-  somethingElse();
- }
- pause(6);
- if ($i < $N) {
-  label = 2;
- } else {
-  label = 3;
- }
- if (label == 3) {
-  somethingElse();
- }
- pause(7);
- free: while (1) {
-  if ($i < $N) {
-   label = 2;
-  } else {
-   label = 3; // this cannot be removed!
-   break;
-  }
-  if (label == 2) {
-   somethingElse();
-  }
-  if ($i < $N) {
-   label = 2;
-  } else {
-   label = 3; // this can be removed!
-  }
-  if (label == 2) {
-   somethingElse();
-  }
-  nothing();
- }
- pause(8);
- var $cmp95 = $69 == -1;
- if ($cmp95) {
-  label = 35;
- } else {
-  label = 38;
- }
- $if_then96$$if_end110thread_pre_split$48 : do {
-  if (label == 35) {
-   if (!$cmp103) {
-    label = 38;
-    break $if_then96$$if_end110thread_pre_split$48;
-   }
-   if (!$cmp106) {
-    label = 38;
-    break $if_then96$$if_end110thread_pre_split$48;
-   }
-   label = 39;
-   break $if_then96$$if_end110thread_pre_split$48;
-  }
- } while (0);
- $if_end110$$if_end110thread_pre_split$52 : do {
-  if (label == 38) {
-   var $79 = $_pr6;
-  }
- } while (0);
- pause(9);
- var $cmp70 = ($call69 | 0) != 0;
- if ($cmp70) {
-  label = 40;
- } else {
-  label = 41;
- }
- $if_then72$$if_end73$126 : do {
-  if (label == 40) {} else if (label == 41) {}
- } while (0);
- pause(10);
- while(check()) {
-  if ($i < $N) {
-   label = 2;
-  } else {
-   label = 3;
-  }
-  if (label == 2) {
-   callOther();
-   break;
-  } else if (label == 3) {
-   somethingElse();
-  }
-  if ($i1 < $N) {
-   label = 2;
-  } else {
-   label = 3;
-  }
-  if (label == 2) {
-   callOther();
-   continue;
-  } else if (label == 3) {
-   somethingElse();
-  }
-  if ($i2 < $N) {
-   label = 2;
-  } else {
-   label = 3;
-  }
-  if (label == 2) {
-   callOther();
-  } else if (label == 3) {
-   somethingElse();
-   break;
-  }
-  if ($i3 < $N) {
-   label = 2;
-  } else {
-   label = 3;
-  }
-  if (label == 2) {
-   callOther();
-  } else if (label == 3) {
-   somethingElse();
-   continue;
-  }
-  if ($i4 < $N) {
-   label = 2;
-  } else {
-   label = 3;
-  }
-  if (label == 2) {
-   callOther();
-   break;
-  } else if (label == 3) {
-   somethingElse();
-   continue;
-  }
- }
-}
-function innerShouldAlsoBeHoisted() {
- function hoisting() {
-  if ($i < $N) {
-   label = 2;
-  }
-  if (label == 2) {
-   callOther();
-  }
- }
-}
-var FS = {
- absolutePath: function(relative, base) { // Don't touch this!
-  if (typeof relative !== 'string') return null;
-  if (base === undefined) base = FS.currentPath;
-  if (relative && relative[0] == '/') base = '';
-  var full = base + '/' + relative;
-  var parts = full.split('/').reverse();
-  var absolute = [''];
-  while (parts.length) {
-   var part = parts.pop();
-   if (part == '' || part == '.') {
-    // Nothing.
-   } else if (part == '..') {
-    if (absolute.length > 1) absolute.pop();
-   } else {
-    absolute.push(part);
-   }
-  }
-  return absolute.length == 1 ? '/' : absolute.join('/');
- }
-}
-function sleep() {
- while (Date.now() - start < msec) {
-  // Do nothing. This empty block should remain untouched (c.f. _usleep)
- }
- return 0;
-}
-function demangle($cmp) {
- if ($cmp) {
-  label = 3;
- } else {
-  label = 1;
- }
- $if_then$$lor_lhs_false$2 : do {
-  if (label == 1) {
-   if (something()) {
-    label = 3;
-    break $if_then$$lor_lhs_false$2;
-   }
-   more();
-   break $if_then$$lor_lhs_false$2;
-  }
- } while (0);
- $if_then$$return$6 : do {
-  if (label == 3) {
-   final();
-  }
- } while (0);
-}
-function lua() {
- $5$98 : while (1) {
-  if ($14) {
-   label = 3;
-  } else {
-   label = 4;
-  }
-  $15$$16$101 : do {
-   if (label == 3) {} else if (label == 4) {
-    var $17 = $i;
-    var $18 = $3;
-    var $19 = $18 + ($17 << 2) | 0;
-    var $20 = HEAP32[$19 >> 2];
-    var $21 = $20 + 1 | 0;
-    var $22 = HEAP8[$21];
-    var $23 = $22 << 24 >> 24;
-    break $15$$16$101;
-   }
-  } while(0);
- }
- pause();
- if ($1435 == 0) {
-  label = 176;
-  cheez();
- } else if ($1435 == 1) {} else {
-  label = 180;
-  cheez();
- }
- pause();
- if ($1435 == 0) {
-  label = 176;
-  cheez();
- } else if ($1435 == 1) {}
-}
-function moreLabels() {
- $for_cond$2 : while (1) { // even this label should vanish
-  if (!$cmp) {
-   break $for_cond$2;
-  }
-  $if_then$$for_inc$5 : do {
-   if ($cmp1) {
-    break $for_cond$2;
-   } else {
-    inc();
-   }
-  } while (0);
-  $if_then$$for_inc$5 : do {} while (0);
- }
- pause(999);
- $while_body$$while_end$31 : do {
-  if ($cmp3) {
-   var $6 = $5;
-   {
-    while (1) {
-     var $6;
-     $iter = $6 + 3;
-     if (FHEAP[$iter + 1] < $pct_addr) {
-      var $6 = $iter;
-     } else {
-      var $_lcssa = $iter;
-      break $while_body$$while_end$31;
-     }
-    }
-   }
-  } else {
-   var $_lcssa = $5;
-   label = 2;
-  }
- } while (0);
- var $_lcssa;
- cheez();
-}
-function notComps() {
- if (!(HEAP32[$incdec_ptr71_i + 8 >> 2] == 0)) {
-  shoo();
- }
-}
-function tricky() {
- // The &-1 is a rounding correction, and must not be removed
- var $conv642 = ($conv6374 - (($132 << 16 >> 16 | 0) / 2 & -1) | 0) & 65535;
-}
-function asmy() {
- f(HEAP8[_buf + i6 & 16777215] & 255);
- f(HEAPU8[_buf + i6 & 16777215] & 255);
- f(HEAP8[_buf + i6 & 16777215] & 255 & 1);
- f(HEAPU8[_buf + i6 & 16777215] & 255 & 1);
- f(HEAP8[_buf + i6 & 16777215] & 1 & 255);
- f(HEAPU8[_buf + i6 & 16777215] & 1 & 255);
- f((HEAP8[_buf + i6 & 16777215] & 255 & 1) + i5 | 0);
- f((HEAPU8[_buf + i6 & 16777215] & 255 & 1) + i5 | 0);
- f((HEAP8[_buf + i6 & 16777215] & 1 & 255) + i5 | 0);
- f((HEAPU8[_buf + i6 & 16777215] & 1 & 255) + i5 | 0);
- f(HEAP32[((46 + 2)|0) >> 2]);
- f(HEAPU32[((46 + 2)|0) >> 2]);
- f(HEAP32[((((((43 + 3)|0) + 2)|0) >> 2) + 8) >> 2]);
- f(HEAPU32[((((((43 + 3)|0) + 2)|0) >> 2) + 8) >> 2]);
- if ((_sbrk($419 | 0) | 0 | 0) == -1) {
-  print('fleefl');
- }
-}
-function dblMax() {
- var x = +1.7976931348623157E+308;
-}