testcase for flattening of switches with cases that need to be kept together

2 files changed, 184 insertions, 0 deletions

diff --git a/tools/test-js-optimizer-asm-outline1-output.js b/tools/test-js-optimizer-asm-outline1-output.js
index d8ea9446..895004d8 100644
--- a/tools/test-js-optimizer-asm-outline1-output.js
+++ b/tools/test-js-optimizer-asm-outline1-output.js
@@ -321,6 +321,48 @@ function chain() {
  helper$0 = HEAP32[sp + 8 >> 2] | 0;
  STACKTOP = sp;
 }
+function switchh() {
+ var helper$0 = 0, helper$1 = 0, sp = 0;
+ sp = STACKTOP;
+ STACKTOP = STACKTOP + 296 | 0;
+ helper$0 = 1;
+ helper$1 = x;
+ if (helper$0) {
+  helper$0 = 0;
+  switch (helper$1 | 0) {
+  case 0:
+   {
+    f(0);
+    g();
+    break;
+   }
+  default:
+   {
+    helper$0 = 1;
+   }
+  }
+ }
+ HEAP32[sp + 8 >> 2] = helper$0;
+ HEAP32[sp + 16 >> 2] = helper$1;
+ HEAP32[sp + 40 >> 2] = 0;
+ HEAP32[sp + 44 >> 2] = 0;
+ switchh$2(sp);
+ helper$0 = HEAP32[sp + 8 >> 2] | 0;
+ HEAP32[sp + 8 >> 2] = helper$0;
+ HEAP32[sp + 16 >> 2] = helper$1;
+ HEAP32[sp + 32 >> 2] = 0;
+ HEAP32[sp + 36 >> 2] = 0;
+ switchh$1(sp);
+ helper$0 = HEAP32[sp + 8 >> 2] | 0;
+ if (helper$0) {
+  helper$0 = 0;
+  HEAP32[sp + 16 >> 2] = helper$1;
+  HEAP32[sp + 24 >> 2] = 0;
+  HEAP32[sp + 28 >> 2] = 0;
+  switchh$0(sp);
+ }
+ STACKTOP = sp;
+}
 function lin$0(sp) {
  sp = sp | 0;
  c(14);
@@ -645,4 +687,98 @@ function chain$4(sp) {
  }
  HEAP32[sp + 8 >> 2] = helper$0;
 }
+function switchh$0(sp) {
+ sp = sp | 0;
+ var helper$1 = 0;
+ helper$1 = HEAP32[sp + 16 >> 2] | 0;
+ switch (helper$1 | 0) {
+ case 4:
+  {
+   f(4);
+   g();
+  }
+ case 5:
+  {
+   f(5);
+   g();
+  }
+ case 6:
+  {
+   f(6);
+   g();
+  }
+ default:
+  {
+   print(9);
+  }
+ }
+}
+function switchh$1(sp) {
+ sp = sp | 0;
+ var helper$0 = 0, helper$1 = 0;
+ helper$0 = HEAP32[sp + 8 >> 2] | 0;
+ helper$1 = HEAP32[sp + 16 >> 2] | 0;
+ if (helper$0) {
+  helper$0 = 0;
+  switch (helper$1 | 0) {
+  case 21:
+  case 22:
+  case 23:
+  case 24:
+  case 25:
+  case 26:
+  case 27:
+  case 28:
+  case 29:
+  case 3:
+   {
+    f(3);
+    g();
+    break;
+   }
+  default:
+   {
+    helper$0 = 1;
+   }
+  }
+ }
+ HEAP32[sp + 8 >> 2] = helper$0;
+}
+function switchh$2(sp) {
+ sp = sp | 0;
+ var helper$0 = 0, helper$1 = 0;
+ helper$0 = HEAP32[sp + 8 >> 2] | 0;
+ helper$1 = HEAP32[sp + 16 >> 2] | 0;
+ if (helper$0) {
+  helper$0 = 0;
+  switch (helper$1 | 0) {
+  case 1:
+   {
+    f(1);
+    g();
+    break;
+   }
+  default:
+   {
+    helper$0 = 1;
+   }
+  }
+ }
+ if (helper$0) {
+  helper$0 = 0;
+  switch (helper$1 | 0) {
+  case 2:
+   {
+    f(2);
+    g();
+    break;
+   }
+  default:
+   {
+    helper$0 = 1;
+   }
+  }
+ }
+ HEAP32[sp + 8 >> 2] = helper$0;
+}
 
diff --git a/tools/test-js-optimizer-asm-outline1.js b/tools/test-js-optimizer-asm-outline1.js
index 311cb206..3c454182 100644
--- a/tools/test-js-optimizer-asm-outline1.js
+++ b/tools/test-js-optimizer-asm-outline1.js
@@ -259,5 +259,53 @@ function chain() {
     print(99);
   }
 }
+function switchh() {
+  switch (x) {
+    case 0: {
+      f(0);
+      g();
+      break;
+    }
+    case 1: {
+      f(1);
+      g();
+      break;
+    }
+    case 2: {
+      f(2);
+      g();
+      break;
+    }
+    case 21: // gotta keem em unseparated
+    case 22:
+    case 23:
+    case 24:
+    case 25:
+    case 26:
+    case 27:
+    case 28:
+    case 29:
+    case 3: { // these too
+      f(3);
+      g();
+      break;
+    }
+    case 4: {
+      f(4);
+      g();
+    }
+    case 5: {
+      f(5);
+      g();
+    }
+    case 6: {
+      f(6);
+      g();
+    }
+    default: {
+      print(9);
+    }
+  }
+}
 // EMSCRIPTEN_GENERATED_FUNCTIONS
 // EXTRA_INFO: { "sizeToOutline": 30, "allowCostlyOutlines": 1 }