Merge branch 'incoming'

4 files changed, 254 insertions, 0 deletions

diff --git a/tools/eliminator/asm-eliminator-test-output.js b/tools/eliminator/asm-eliminator-test-output.js
new file mode 100644
index 00000000..3170bd9c
--- /dev/null
+++ b/tools/eliminator/asm-eliminator-test-output.js
@@ -0,0 +1,103 @@
+function asm(x, y) {
+  x = +x;
+  y = y | 0;
+  var a = 0;
+  a = cheez(y + ~~x | 0) | 0;
+  fleefl(a * a | 0, a | 0);
+}
+function __Z11printResultPiS_j($needle, $haystack, $len) {
+  $needle = $needle | 0;
+  $haystack = $haystack | 0;
+  $len = $len | 0;
+  var $3 = 0, __stackBase__ = 0;
+  __stackBase__ = STACKTOP;
+  $3 = _bsearch($needle, $haystack, $len, 4, 2);
+  if (($3 | 0) == 0) {
+    _puts(_str | 0);
+    STACKTOP = __stackBase__;
+    return;
+  } else {
+    _printf(__str1 | 0, (tempInt = STACKTOP, STACKTOP = STACKTOP + 4 | 0, HEAP32[(tempInt & 16777215) >> 2] = HEAP32[($3 & 16777215) >> 2] | 0, tempInt));
+    STACKTOP = __stackBase__;
+    return;
+  }
+}
+function _segment_holding($addr) {
+  $addr = $addr | 0;
+  var $sp_0 = 0, $3 = 0, $12 = 0, $_0 = 0, label = 0;
+  $sp_0 = __gm_ + 444 | 0;
+  while (1) {
+    $3 = HEAP32[(($sp_0 | 0) & 16777215) >> 2] | 0;
+    if (!($3 >>> 0 > $addr >>> 0)) {
+      if (($3 + (HEAP32[(($sp_0 + 4 | 0) & 16777215) >> 2] | 0) | 0) >>> 0 > $addr >>> 0) {
+        $_0 = $sp_0;
+        label = 1658;
+        break;
+      }
+    }
+    $12 = HEAP32[(($sp_0 + 8 | 0) & 16777215) >> 2] | 0;
+    if (($12 | 0) == 0) {
+      $_0 = 0;
+      label = 1659;
+      break;
+    } else {
+      $sp_0 = $12;
+    }
+  }
+  if (label == 1659) {
+    return $_0;
+  } else if (label == 1658) {
+    return $_0;
+  }
+}
+function __ZN5identC2EiPKcPci($this, $n, $a) {
+  $this = $this | 0;
+  $n = $n | 0;
+  $a = $a | 0;
+  HEAP32[($this & 16777215) >> 2] = __ZTV5ident + 8 | 0;
+  HEAP32[($this + 4 & 16777215) >> 2] = 5;
+  HEAP32[($this + 8 & 16777215) >> 2] = $n;
+  HEAP32[($this + 20 & 16777215) >> 2] = 2147483647;
+  HEAP32[($this + 24 & 16777215) >> 2] = 0;
+  HEAP32[($this + 28 & 16777215) >> 2] = $a;
+  HEAP32[($this + 32 & 16777215) >> 2] = 0;
+  HEAP32[($this + 40 & 16777215) >> 2] = 1;
+  return;
+}
+function _vec2Length($this) {
+  $this = $this | 0;
+  var $__first_addr_i = 0, $__last_addr_i = 0, __stackBase__ = 0;
+  __stackBase__ = STACKTOP;
+  STACKTOP = STACKTOP + 8 | 0;
+  $__first_addr_i = __stackBase__;
+  $__last_addr_i = __stackBase__ + 4;
+  STACKTOP = __stackBase__;
+  return 0;
+}
+function exc($this) {
+  $this = $this | 0;
+  var $1 = 0, $5 = 0;
+  $1 = (function() {
+    try {
+      __THREW__ = false;
+      return __ZNSt3__16locale8__globalEv();
+    } catch (e) {
+      if (typeof e != "number") throw e;
+      if (ABORT) throw e;
+      __THREW__ = true;
+      Module.print("Exception: " + e + ", currently at: " + (new Error).stack);
+      return null;
+    }
+  })();
+  if (!__THREW__) {
+    $5 = HEAP32[(($1 | 0) & 16777215) >> 2] | 0;
+    HEAP32[(($this | 0) & 16777215) >> 2] = $5;
+    __ZNSt3__114__shared_count12__add_sharedEv($5 | 0);
+    return;
+  } else {
+    $8$0 = ___cxa_find_matching_catch(HEAP32[(_llvm_eh_exception.buf & 16777215) >> 2] | 0, HEAP32[(_llvm_eh_exception.buf + 4 & 16777215) >> 2] | 0, []);
+    $8$1 = tempRet0;
+    ___cxa_call_unexpected($8$0);
+  }
+}
+
diff --git a/tools/eliminator/asm-eliminator-test.js b/tools/eliminator/asm-eliminator-test.js
new file mode 100644
index 00000000..ce34a7a6
--- /dev/null
+++ b/tools/eliminator/asm-eliminator-test.js
@@ -0,0 +1,134 @@
+function asm(x, y) {
+  x = +x;
+  y = y|0;
+  var a = 0, b = +0, c = 0;
+  var label = 0;
+  a = cheez((y+~~x)|0)|0;
+  b = a*a;
+  fleefl(b|0, a|0);
+}
+function __Z11printResultPiS_j($needle, $haystack, $len) {
+  $needle = $needle | 0;
+  $haystack = $haystack | 0;
+  $len = $len | 0;
+  var $1 = 0, $2 = 0, $3 = 0, $4 = 0, $puts = 0, $7 = 0, $8 = 0, $9 = 0;
+  var label = 0;
+  var __stackBase__ = 0;
+  __stackBase__ = STACKTOP;
+  $1 = $needle;
+  $2 = $haystack;
+  $3 = _bsearch($1, $2, $len, 4, 2);
+  $4 = ($3 | 0) == 0;
+  if ($4) {
+    $puts = _puts(_str | 0);
+    STACKTOP = __stackBase__;
+    return;
+  } else {
+    $7 = $3;
+    $8 = HEAP32[($7 & 16777215) >> 2] | 0;
+    $9 = _printf(__str1 | 0, (tempInt = STACKTOP, STACKTOP = STACKTOP + 4 | 0, HEAP32[(tempInt & 16777215) >> 2] = $8, tempInt));
+    STACKTOP = __stackBase__;
+    return;
+  }
+}
+function _segment_holding($addr) {
+  $addr = $addr | 0;
+  var $sp_0 = 0, $2 = 0, $3 = 0, $4 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0;
+  var $11 = 0, $12 = 0, $13 = 0, $_0 = 0;
+  var label = 0;
+  $sp_0 = __gm_ + 444 | 0;
+  while (1) {
+    $2 = $sp_0 | 0;
+    $3 = HEAP32[($2 & 16777215) >> 2] | 0;
+    $4 = $3 >>> 0 > $addr >>> 0;
+    if (!$4) {
+      $6 = $sp_0 + 4 | 0;
+      $7 = HEAP32[($6 & 16777215) >> 2] | 0;
+      $8 = $3 + $7 | 0;
+      $9 = $8 >>> 0 > $addr >>> 0;
+      if ($9) {
+        $_0 = $sp_0;
+        label = 1658;
+        break;
+      }
+    }
+    $11 = $sp_0 + 8 | 0;
+    $12 = HEAP32[($11 & 16777215) >> 2] | 0;
+    $13 = ($12 | 0) == 0;
+    if ($13) {
+      $_0 = 0;
+      label = 1659;
+      break;
+    } else {
+      $sp_0 = $12;
+    }
+  }
+  if (label == 1659) {
+    return $_0;
+  } else if (label == 1658) {
+    return $_0;
+  }
+}
+function __ZN5identC2EiPKcPci($this, $n, $a) {
+  $this = $this | 0;
+  $n = $n | 0;
+  $a = $a | 0;
+  HEAP32[($this & 16777215) >> 2] = __ZTV5ident + 8 | 0;
+  HEAP32[($this + 4 & 16777215) >> 2] = 5;
+  HEAP32[($this + 8 & 16777215) >> 2] = $n;
+  HEAP32[($this + 20 & 16777215) >> 2] = 2147483647;
+  HEAP32[($this + 24 & 16777215) >> 2] = 0;
+  HEAP32[($this + 28 & 16777215) >> 2] = $a;
+  HEAP32[($this + 32 & 16777215) >> 2] = 0;
+  HEAP32[($this + 40 & 16777215) >> 2] = 1;
+  return;
+}
+function _vec2Length($this) {
+  $this = $this | 0;
+  var $__first_addr_i = 0, $__last_addr_i = 0, $__comp_addr_i = 0, $a13 = 0, $a14 = 0, $a18 = 0, $a19 = 0;
+  var label = 0;
+  var __stackBase__ = 0;
+  __stackBase__ = STACKTOP;
+  STACKTOP = STACKTOP + 8 | 0;
+  $__first_addr_i = __stackBase__;
+  $__last_addr_i = __stackBase__ + 4;
+  $a13 = $__first_addr_i;
+  $a14 = $__last_addr_i;
+  $a18 = $__first_addr_i;
+  $a19 = $__last_addr_i;
+  STACKTOP = __stackBase__;
+  return 0;
+}
+function exc($this) {
+  $this = $this | 0;
+  var $1 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $8 = +0, $9 = 0;
+  var label = 0;
+  var $1 = (function() {
+    try {
+      __THREW__ = false;
+      return __ZNSt3__16locale8__globalEv();
+    } catch (e) {
+      if (typeof e != "number") throw e;
+      if (ABORT) throw e;
+      __THREW__ = true;
+      Module.print("Exception: " + e + ", currently at: " + (new Error).stack);
+      return null;
+    }
+  })();
+  if (!__THREW__) {
+    $3 = $this | 0;
+    $4 = $1 | 0;
+    $5 = HEAP32[($4 & 16777215) >> 2] | 0;
+    HEAP32[($3 & 16777215) >> 2] = $5;
+    $6 = $5 | 0;
+    __ZNSt3__114__shared_count12__add_sharedEv($6);
+    return;
+  } else {
+    $8$0 = ___cxa_find_matching_catch(HEAP32[(_llvm_eh_exception.buf & 16777215) >> 2] | 0, HEAP32[(_llvm_eh_exception.buf + 4 & 16777215) >> 2] | 0, []);
+    $8$1 = tempRet0;
+    $9 = $8$0;
+    ___cxa_call_unexpected($9);
+  }
+}
+// EMSCRIPTEN_GENERATED_FUNCTIONS: ["asm", "__Z11printResultPiS_j", "_segment_holding", "__ZN5identC2EiPKcPci", "_vec2Length", "exc"]
+
diff --git a/tools/eliminator/eliminator-test-output.js b/tools/eliminator/eliminator-test-output.js
index 37a5d104..a005a0a5 100644
--- a/tools/eliminator/eliminator-test-output.js
+++ b/tools/eliminator/eliminator-test-output.js
@@ -6132,6 +6132,14 @@ function _mallocNoU($bytes) {
   return $mem_0;
   return null;
 }
+function asm(x, y) {
+  x = +x;
+  y = y | 0;
+  var a = 0, b = +0;
+  a = cheez(y + ~~x | 0) | 0;
+  b = a * a;
+  fleefl(b | 0, a | 0);
+}
 function phi() {
   if (wat()) {
     var $10 = 1;
diff --git a/tools/eliminator/eliminator-test.js b/tools/eliminator/eliminator-test.js
index 32bb9d5b..13ecab59 100644
--- a/tools/eliminator/eliminator-test.js
+++ b/tools/eliminator/eliminator-test.js
@@ -8828,6 +8828,15 @@ function _mallocNoU($bytes) {
   return $mem_0;
   return null;
 }
+function asm(x, y) { // asm-style code, without special asm requested so will not be fully optimized
+  x = +x;
+  y = y|0;
+  var a = 0, b = +0, c = 0;
+  var label = 0;
+  a = cheez((y+~~x)|0)|0;
+  b = a*a;
+  fleefl(b|0, a|0);
+}
 function phi() {
   if (wat()) {
     var $10 = 1;