use a separate stack location for control variable information for each outlined function, to avoid problems when outlining right through the support code for a previous outlining

1 files changed, 95 insertions, 95 deletions

diff --git a/tools/test-js-optimizer-asm-outline2-output.js b/tools/test-js-optimizer-asm-outline2-output.js
index 4b7bb6e2..31bb7bf9 100644
--- a/tools/test-js-optimizer-asm-outline2-output.js
+++ b/tools/test-js-optimizer-asm-outline2-output.js
@@ -1,7 +1,7 @@
 function linear() {
  var sp = 0;
  sp = STACKTOP;
- STACKTOP = STACKTOP + 16 | 0;
+ STACKTOP = STACKTOP + 72 | 0;
  cheez(1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0);
  cheez(1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0);
  cheez(1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0);
@@ -11,11 +11,11 @@ function linear() {
  cheez(1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0);
  cheez(1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0);
  cheez(1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0);
- HEAP32[sp + 0 >> 2] = 0;
- HEAP32[sp + 8 >> 2] = 0;
+ HEAP32[sp + 16 >> 2] = 0;
+ HEAP32[sp + 20 >> 2] = 0;
  sp = linear$1(sp) | 0;
- HEAP32[sp + 0 >> 2] = 0;
  HEAP32[sp + 8 >> 2] = 0;
+ HEAP32[sp + 12 >> 2] = 0;
  sp = linear$0(sp) | 0;
  STACKTOP = sp;
 }
@@ -47,24 +47,24 @@ function _free($mem) {
    if (($mem + (-8 - $21 | 0) | 0) >>> 0 < $5 >>> 0) {
     _abort();
    }
-   HEAP32[sp + 632 >> 2] = 0;
-   HEAP32[sp + 640 >> 2] = 0;
-   HEAP32[sp + 40 >> 2] = $25;
-   HEAP32[sp + 0 >> 2] = $mem;
-   HEAP32[sp + 16 >> 2] = $10;
-   HEAP32[sp + 48 >> 2] = $26;
-   HEAP32[sp + 32 >> 2] = $21;
-   HEAP32[sp + 8 >> 2] = $5;
-   HEAP32[sp + 216 >> 2] = $p_0;
-   HEAP32[sp + 208 >> 2] = $psize_0;
+   HEAP32[sp + 648 >> 2] = 0;
+   HEAP32[sp + 652 >> 2] = 0;
+   HEAP32[sp + 48 >> 2] = $25;
+   HEAP32[sp + 8 >> 2] = $mem;
+   HEAP32[sp + 24 >> 2] = $10;
+   HEAP32[sp + 56 >> 2] = $26;
+   HEAP32[sp + 40 >> 2] = $21;
+   HEAP32[sp + 16 >> 2] = $5;
+   HEAP32[sp + 224 >> 2] = $p_0;
+   HEAP32[sp + 216 >> 2] = $psize_0;
    sp = _free$1(sp) | 0;
-   $p_0 = HEAP32[sp + 216 >> 2] | 0;
-   $psize_0 = HEAP32[sp + 208 >> 2] | 0;
-   tempValue = HEAP32[sp + 632 >> 2] | 0;
-   tempInt = HEAP32[sp + 640 >> 2] | 0;
-   tempDouble = +HEAPF32[sp + 640 >> 2];
-   HEAP32[sp + 632 >> 2] = 0;
-   HEAP32[sp + 640 >> 2] = 0;
+   $p_0 = HEAP32[sp + 224 >> 2] | 0;
+   $psize_0 = HEAP32[sp + 216 >> 2] | 0;
+   tempValue = HEAP32[sp + 648 >> 2] | 0;
+   tempInt = HEAP32[sp + 652 >> 2] | 0;
+   tempDouble = +HEAPF32[sp + 652 >> 2];
+   HEAP32[sp + 648 >> 2] = 0;
+   HEAP32[sp + 652 >> 2] = 0;
    if ((tempValue | 0) == 5) {
     return;
    }
@@ -92,21 +92,21 @@ function _free($mem) {
  if (($194 & 1 | 0) == 0) {
   _abort();
  }
- HEAP32[sp + 632 >> 2] = 0;
- HEAP32[sp + 640 >> 2] = 0;
- HEAP32[sp + 232 >> 2] = $194;
- HEAP32[sp + 24 >> 2] = $16;
- HEAP32[sp + 208 >> 2] = $psize_0;
- HEAP32[sp + 216 >> 2] = $p_0;
- HEAP32[sp + 224 >> 2] = $189;
- HEAP32[sp + 0 >> 2] = $mem;
- HEAP32[sp + 16 >> 2] = $10;
+ HEAP32[sp + 656 >> 2] = 0;
+ HEAP32[sp + 660 >> 2] = 0;
+ HEAP32[sp + 240 >> 2] = $194;
+ HEAP32[sp + 32 >> 2] = $16;
+ HEAP32[sp + 216 >> 2] = $psize_0;
+ HEAP32[sp + 224 >> 2] = $p_0;
+ HEAP32[sp + 232 >> 2] = $189;
+ HEAP32[sp + 8 >> 2] = $mem;
+ HEAP32[sp + 24 >> 2] = $10;
  sp = _free$2(sp) | 0;
- tempValue = HEAP32[sp + 632 >> 2] | 0;
- tempInt = HEAP32[sp + 640 >> 2] | 0;
- tempDouble = +HEAPF32[sp + 640 >> 2];
- HEAP32[sp + 632 >> 2] = 0;
- HEAP32[sp + 640 >> 2] = 0;
+ tempValue = HEAP32[sp + 656 >> 2] | 0;
+ tempInt = HEAP32[sp + 660 >> 2] | 0;
+ tempDouble = +HEAPF32[sp + 660 >> 2];
+ HEAP32[sp + 656 >> 2] = 0;
+ HEAP32[sp + 660 >> 2] = 0;
  if ((tempValue | 0) == 5) {
   return;
  }
@@ -148,14 +148,14 @@ function linear$1(sp) {
 function _free$0(sp) {
  sp = sp | 0;
  var $16 = 0, $220 = 0, $psize_0 = 0, $p_0 = 0, $189 = 0, $227 = 0, $194 = 0, $233 = 0, $mem = 0, $10 = 0, $236 = 0, $_pre_phi305 = 0, $267 = 0, $270 = 0, $273 = 0, $294 = 0, $299 = 0, $R7_1 = 0, $R7_0 = 0, $RP9_0 = 0, $301 = 0, $302 = 0, $305 = 0, $306 = 0, $278 = 0, $320 = 0, $351 = 0, $364 = 0, $psize_1 = 0;
- $psize_1 = HEAP32[sp + 416 >> 2] | 0;
- $10 = HEAP32[sp + 16 >> 2] | 0;
- $mem = HEAP32[sp + 0 >> 2] | 0;
- $194 = HEAP32[sp + 232 >> 2] | 0;
- $189 = HEAP32[sp + 224 >> 2] | 0;
- $p_0 = HEAP32[sp + 216 >> 2] | 0;
- $psize_0 = HEAP32[sp + 208 >> 2] | 0;
- $16 = HEAP32[sp + 24 >> 2] | 0;
+ $psize_1 = HEAP32[sp + 424 >> 2] | 0;
+ $10 = HEAP32[sp + 24 >> 2] | 0;
+ $mem = HEAP32[sp + 8 >> 2] | 0;
+ $194 = HEAP32[sp + 240 >> 2] | 0;
+ $189 = HEAP32[sp + 232 >> 2] | 0;
+ $p_0 = HEAP32[sp + 224 >> 2] | 0;
+ $psize_0 = HEAP32[sp + 216 >> 2] | 0;
+ $16 = HEAP32[sp + 32 >> 2] | 0;
  OL : do {
   if (($16 | 0) == (HEAP32[25] | 0)) {
    $220 = (HEAP32[22] | 0) + $psize_0 | 0;
@@ -163,7 +163,7 @@ function _free$0(sp) {
    HEAP32[25] = $p_0;
    HEAP32[$p_0 + 4 >> 2] = $220 | 1;
    HEAP32[$189 + $220 >> 2] = $220;
-   HEAP32[sp + 632 >> 2] = 5;
+   HEAP32[sp + 640 >> 2] = 5;
    break OL;
   }
   $227 = ($194 & -8) + $psize_0 | 0;
@@ -323,40 +323,40 @@ function _free$0(sp) {
   HEAP32[$189 + $227 >> 2] = $227;
   if (($p_0 | 0) != (HEAP32[25] | 0)) {
    $psize_1 = $227;
-   HEAP32[sp + 632 >> 2] = 1;
+   HEAP32[sp + 640 >> 2] = 1;
    break OL;
   }
   HEAP32[22] = $227;
-  HEAP32[sp + 632 >> 2] = 5;
+  HEAP32[sp + 640 >> 2] = 5;
   break OL;
  } while (0);
- HEAP32[sp + 416 >> 2] = $psize_1;
+ HEAP32[sp + 424 >> 2] = $psize_1;
  return sp | 0;
 }
 function _free$1(sp) {
  sp = sp | 0;
  var $25 = 0, $mem = 0, $10 = 0, $26 = 0, $21 = 0, $37 = 0, $40 = 0, $5 = 0, $_pre_phi307 = 0, $69 = 0, $72 = 0, $75 = 0, $95 = 0, $100 = 0, $R_1 = 0, $R_0 = 0, $RP_0 = 0, $102 = 0, $103 = 0, $106 = 0, $107 = 0, $80 = 0, $120 = 0, $151 = 0, $164 = 0, $p_0 = 0, $psize_0 = 0;
- $psize_0 = HEAP32[sp + 208 >> 2] | 0;
- $p_0 = HEAP32[sp + 216 >> 2] | 0;
- $5 = HEAP32[sp + 8 >> 2] | 0;
- $21 = HEAP32[sp + 32 >> 2] | 0;
- $26 = HEAP32[sp + 48 >> 2] | 0;
- $10 = HEAP32[sp + 16 >> 2] | 0;
- $mem = HEAP32[sp + 0 >> 2] | 0;
- $25 = HEAP32[sp + 40 >> 2] | 0;
+ $psize_0 = HEAP32[sp + 216 >> 2] | 0;
+ $p_0 = HEAP32[sp + 224 >> 2] | 0;
+ $5 = HEAP32[sp + 16 >> 2] | 0;
+ $21 = HEAP32[sp + 40 >> 2] | 0;
+ $26 = HEAP32[sp + 56 >> 2] | 0;
+ $10 = HEAP32[sp + 24 >> 2] | 0;
+ $mem = HEAP32[sp + 8 >> 2] | 0;
+ $25 = HEAP32[sp + 48 >> 2] | 0;
  OL : do {
   if (($25 | 0) == (HEAP32[25] | 0)) {
    if ((HEAP32[($mem + (($10 & -8) - 4) | 0) >> 2] & 3 | 0) != 3) {
     $p_0 = $25;
     $psize_0 = $26;
-    HEAP32[sp + 632 >> 2] = 1;
+    HEAP32[sp + 648 >> 2] = 1;
     break OL;
    }
    HEAP32[22] = $26;
    HEAP32[($mem + (($10 & -8) - 4) | 0) >> 2] = HEAP32[($mem + (($10 & -8) - 4) | 0) >> 2] & -2;
    HEAP32[$mem + ((-8 - $21 | 0) + 4) >> 2] = $26 | 1;
    HEAP32[($mem + (($10 & -8) - 8) | 0) >> 2] = $26;
-   HEAP32[sp + 632 >> 2] = 5;
+   HEAP32[sp + 648 >> 2] = 5;
    break OL;
   }
   if ($21 >>> 0 < 256) {
@@ -377,7 +377,7 @@ function _free$1(sp) {
     HEAP32[20] = HEAP32[20] & (1 << ($21 >>> 3) ^ -1);
     $p_0 = $25;
     $psize_0 = $26;
-    HEAP32[sp + 632 >> 2] = 1;
+    HEAP32[sp + 648 >> 2] = 1;
     break OL;
    }
    do {
@@ -398,7 +398,7 @@ function _free$1(sp) {
    HEAP32[$_pre_phi307 >> 2] = $37;
    $p_0 = $25;
    $psize_0 = $26;
-   HEAP32[sp + 632 >> 2] = 1;
+   HEAP32[sp + 648 >> 2] = 1;
    break OL;
   }
   $69 = $mem + (-8 - $21 | 0) | 0;
@@ -465,7 +465,7 @@ function _free$1(sp) {
   if (($72 | 0) == 0) {
    $p_0 = $25;
    $psize_0 = $26;
-   HEAP32[sp + 632 >> 2] = 1;
+   HEAP32[sp + 648 >> 2] = 1;
    break OL;
   }
   $120 = 384 + (HEAP32[($mem + ((-8 - $21 | 0) + 28) | 0) >> 2] << 2) | 0;
@@ -478,8 +478,8 @@ function _free$1(sp) {
     HEAP32[21] = HEAP32[21] & (1 << HEAP32[($mem + ((-8 - $21 | 0) + 28) | 0) >> 2] ^ -1);
     $p_0 = $25;
     $psize_0 = $26;
-    HEAP32[sp + 632 >> 2] = 2;
-    HEAP32[sp + 640 >> 2] = 2;
+    HEAP32[sp + 648 >> 2] = 2;
+    HEAP32[sp + 652 >> 2] = 2;
     break OL;
    } else {
     if ($72 >>> 0 < (HEAP32[24] | 0) >>> 0) {
@@ -493,8 +493,8 @@ function _free$1(sp) {
     if (($R_1 | 0) == 0) {
      $p_0 = $25;
      $psize_0 = $26;
-     HEAP32[sp + 632 >> 2] = 2;
-     HEAP32[sp + 640 >> 2] = 2;
+     HEAP32[sp + 648 >> 2] = 2;
+     HEAP32[sp + 652 >> 2] = 2;
      break OL;
     }
    }
@@ -519,7 +519,7 @@ function _free$1(sp) {
   if (($164 | 0) == 0) {
    $p_0 = $25;
    $psize_0 = $26;
-   HEAP32[sp + 632 >> 2] = 1;
+   HEAP32[sp + 648 >> 2] = 1;
    break OL;
   }
   if ($164 >>> 0 < (HEAP32[24] | 0) >>> 0) {
@@ -529,24 +529,24 @@ function _free$1(sp) {
    HEAP32[$164 + 24 >> 2] = $R_1;
    $p_0 = $25;
    $psize_0 = $26;
-   HEAP32[sp + 632 >> 2] = 1;
+   HEAP32[sp + 648 >> 2] = 1;
    break OL;
   }
  } while (0);
- HEAP32[sp + 216 >> 2] = $p_0;
- HEAP32[sp + 208 >> 2] = $psize_0;
+ HEAP32[sp + 224 >> 2] = $p_0;
+ HEAP32[sp + 216 >> 2] = $psize_0;
  return sp | 0;
 }
 function _free$2(sp) {
  sp = sp | 0;
  var $194 = 0, $16 = 0, $204 = 0, $psize_0 = 0, $p_0 = 0, $189 = 0, $mem = 0, $10 = 0, $psize_1 = 0, $390 = 0, $396 = 0, $F16_0 = 0, $_pre_phi = 0, $404 = 0, $414 = 0, $415 = 0, $I18_0 = 0, $428 = 0, $436 = 0, $443 = 0, $447 = 0, $448 = 0, $463 = 0, $K19_0 = 0, $T_0 = 0, $472 = 0, $473 = 0, label = 0, $486 = 0, $487 = 0, $489 = 0, $501 = 0, $sp_0_in_i = 0, $sp_0_i = 0;
- $10 = HEAP32[sp + 16 >> 2] | 0;
- $mem = HEAP32[sp + 0 >> 2] | 0;
- $189 = HEAP32[sp + 224 >> 2] | 0;
- $p_0 = HEAP32[sp + 216 >> 2] | 0;
- $psize_0 = HEAP32[sp + 208 >> 2] | 0;
- $16 = HEAP32[sp + 24 >> 2] | 0;
- $194 = HEAP32[sp + 232 >> 2] | 0;
+ $10 = HEAP32[sp + 24 >> 2] | 0;
+ $mem = HEAP32[sp + 8 >> 2] | 0;
+ $189 = HEAP32[sp + 232 >> 2] | 0;
+ $p_0 = HEAP32[sp + 224 >> 2] | 0;
+ $psize_0 = HEAP32[sp + 216 >> 2] | 0;
+ $16 = HEAP32[sp + 32 >> 2] | 0;
+ $194 = HEAP32[sp + 240 >> 2] | 0;
  OL : do {
   do {
    if (($194 & 2 | 0) == 0) {
@@ -560,32 +560,32 @@ function _free$2(sp) {
       HEAP32[22] = 0;
      }
      if ($204 >>> 0 <= (HEAP32[27] | 0) >>> 0) {
-      HEAP32[sp + 632 >> 2] = 5;
+      HEAP32[sp + 656 >> 2] = 5;
       break OL;
      }
      _sys_trim(0) | 0;
-     HEAP32[sp + 632 >> 2] = 5;
+     HEAP32[sp + 656 >> 2] = 5;
      break OL;
     }
-    HEAP32[sp + 632 >> 2] = 0;
     HEAP32[sp + 640 >> 2] = 0;
-    HEAP32[sp + 24 >> 2] = $16;
-    HEAP32[sp + 208 >> 2] = $psize_0;
-    HEAP32[sp + 216 >> 2] = $p_0;
-    HEAP32[sp + 224 >> 2] = $189;
-    HEAP32[sp + 232 >> 2] = $194;
-    HEAP32[sp + 0 >> 2] = $mem;
-    HEAP32[sp + 16 >> 2] = $10;
-    HEAP32[sp + 416 >> 2] = $psize_1;
+    HEAP32[sp + 644 >> 2] = 0;
+    HEAP32[sp + 32 >> 2] = $16;
+    HEAP32[sp + 216 >> 2] = $psize_0;
+    HEAP32[sp + 224 >> 2] = $p_0;
+    HEAP32[sp + 232 >> 2] = $189;
+    HEAP32[sp + 240 >> 2] = $194;
+    HEAP32[sp + 8 >> 2] = $mem;
+    HEAP32[sp + 24 >> 2] = $10;
+    HEAP32[sp + 424 >> 2] = $psize_1;
     sp = _free$0(sp) | 0;
-    $psize_1 = HEAP32[sp + 416 >> 2] | 0;
-    tempValue = HEAP32[sp + 632 >> 2] | 0;
-    tempInt = HEAP32[sp + 640 >> 2] | 0;
-    tempDouble = +HEAPF32[sp + 640 >> 2];
-    HEAP32[sp + 632 >> 2] = 0;
+    $psize_1 = HEAP32[sp + 424 >> 2] | 0;
+    tempValue = HEAP32[sp + 640 >> 2] | 0;
+    tempInt = HEAP32[sp + 644 >> 2] | 0;
+    tempDouble = +HEAPF32[sp + 644 >> 2];
     HEAP32[sp + 640 >> 2] = 0;
+    HEAP32[sp + 644 >> 2] = 0;
     if ((tempValue | 0) == 5) {
-     HEAP32[sp + 632 >> 2] = 5;
+     HEAP32[sp + 656 >> 2] = 5;
      break OL;
     }
     if ((tempValue | 0) == 1) {
@@ -620,7 +620,7 @@ function _free$2(sp) {
    HEAP32[$F16_0 + 12 >> 2] = $p_0;
    HEAP32[$p_0 + 8 >> 2] = $F16_0;
    HEAP32[$p_0 + 12 >> 2] = 120 + ($390 << 1 << 2) | 0;
-   HEAP32[sp + 632 >> 2] = 5;
+   HEAP32[sp + 656 >> 2] = 5;
    break OL;
   }
   $414 = $p_0;
@@ -707,7 +707,7 @@ function _free$2(sp) {
   if (($501 | 0) == 0) {
    $sp_0_in_i = 536;
   } else {
-   HEAP32[sp + 632 >> 2] = 5;
+   HEAP32[sp + 656 >> 2] = 5;
    break OL;
   }
   while (1) {
@@ -720,7 +720,7 @@ function _free$2(sp) {
   }
   HEAP32[28] = -1;
   STACKTOP = sp;
-  HEAP32[sp + 632 >> 2] = 5;
+  HEAP32[sp + 656 >> 2] = 5;
   break OL;
  } while (0);
  return sp | 0;