Require `then` and `else` with `if` (#6201)

We previously supported (and primarily used) a non-standard text format for
conditionals in which the condition, if-true expression, and if-false expression
were all simply s-expression children of the `if` expression. The standard text
format, however, requires the use of `then` and `else` forms to introduce the
if-true and if-false arms of the conditional. Update the legacy text parser to
require the standard format and update all tests to match. Update the printer to
print the standard format as well.

The .wast and .wat test inputs were mechanically updated with this script:
https://gist.github.com/tlively/85ae7f01f92f772241ec994c840ccbb1

1 files changed, 783 insertions, 261 deletions

diff --git a/test/passes/safe-heap_disable-simd.txt b/test/passes/safe-heap_disable-simd.txt
index a678bc0dc..bb55667b1 100644
--- a/test/passes/safe-heap_disable-simd.txt
+++ b/test/passes/safe-heap_disable-simd.txt
@@ -37,7 +37,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i32.load8_s
    (local.get $2)
@@ -67,7 +69,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i32.load8_u
    (local.get $2)
@@ -97,7 +101,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i32.load16_s align=1
    (local.get $2)
@@ -127,14 +133,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i32.load16_s
    (local.get $2)
@@ -164,7 +174,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i32.load16_u align=1
    (local.get $2)
@@ -194,14 +206,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i32.load16_u
    (local.get $2)
@@ -231,7 +247,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i32.load align=1
    (local.get $2)
@@ -261,14 +279,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i32.load align=2
    (local.get $2)
@@ -298,14 +320,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 3)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i32.load
    (local.get $2)
@@ -335,7 +361,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.load8_s
    (local.get $2)
@@ -365,7 +393,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.load8_u
    (local.get $2)
@@ -395,7 +425,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.load16_s align=1
    (local.get $2)
@@ -425,14 +457,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.load16_s
    (local.get $2)
@@ -462,7 +498,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.load16_u align=1
    (local.get $2)
@@ -492,14 +530,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.load16_u
    (local.get $2)
@@ -529,7 +571,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.load32_s align=1
    (local.get $2)
@@ -559,14 +603,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.load32_s align=2
    (local.get $2)
@@ -596,14 +644,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 3)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.load32_s
    (local.get $2)
@@ -633,7 +685,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.load32_u align=1
    (local.get $2)
@@ -663,14 +717,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.load32_u align=2
    (local.get $2)
@@ -700,14 +758,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 3)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.load32_u
    (local.get $2)
@@ -737,7 +799,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.load align=1
    (local.get $2)
@@ -767,14 +831,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.load align=2
    (local.get $2)
@@ -804,14 +872,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 3)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.load align=4
    (local.get $2)
@@ -841,14 +913,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 7)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.load
    (local.get $2)
@@ -878,7 +954,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (f32.load align=1
    (local.get $2)
@@ -908,14 +986,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (f32.load align=2
    (local.get $2)
@@ -945,14 +1027,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 3)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (f32.load
    (local.get $2)
@@ -982,7 +1068,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (f64.load align=1
    (local.get $2)
@@ -1012,14 +1100,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (f64.load align=2
    (local.get $2)
@@ -1049,14 +1141,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 3)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (f64.load align=4
    (local.get $2)
@@ -1086,14 +1182,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 7)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (f64.load
    (local.get $2)
@@ -1123,7 +1223,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i32.store8
    (local.get $3)
@@ -1154,7 +1256,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i32.store16 align=1
    (local.get $3)
@@ -1185,14 +1289,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i32.store16
    (local.get $3)
@@ -1223,7 +1331,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i32.store align=1
    (local.get $3)
@@ -1254,14 +1364,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i32.store align=2
    (local.get $3)
@@ -1292,14 +1406,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 3)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i32.store
    (local.get $3)
@@ -1330,7 +1448,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.store8
    (local.get $3)
@@ -1361,7 +1481,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.store16 align=1
    (local.get $3)
@@ -1392,14 +1514,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.store16
    (local.get $3)
@@ -1430,7 +1556,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.store32 align=1
    (local.get $3)
@@ -1461,14 +1589,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.store32 align=2
    (local.get $3)
@@ -1499,14 +1631,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 3)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.store32
    (local.get $3)
@@ -1537,7 +1673,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.store align=1
    (local.get $3)
@@ -1568,14 +1706,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.store align=2
    (local.get $3)
@@ -1606,14 +1748,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 3)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.store align=4
    (local.get $3)
@@ -1644,14 +1790,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 7)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.store
    (local.get $3)
@@ -1682,7 +1832,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (f32.store align=1
    (local.get $3)
@@ -1713,14 +1865,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (f32.store align=2
    (local.get $3)
@@ -1751,14 +1907,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 3)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (f32.store
    (local.get $3)
@@ -1789,7 +1949,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (f64.store align=1
    (local.get $3)
@@ -1820,14 +1982,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (f64.store align=2
    (local.get $3)
@@ -1858,14 +2024,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 3)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (f64.store align=4
    (local.get $3)
@@ -1896,14 +2066,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 7)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (f64.store
    (local.get $3)
@@ -1950,7 +2124,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i32.load8_s
    (local.get $2)
@@ -1980,7 +2156,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i32.load8_u
    (local.get $2)
@@ -2010,7 +2188,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i32.load16_s align=1
    (local.get $2)
@@ -2040,14 +2220,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i32.load16_s
    (local.get $2)
@@ -2077,7 +2261,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i32.load16_u align=1
    (local.get $2)
@@ -2107,14 +2293,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i32.load16_u
    (local.get $2)
@@ -2144,7 +2334,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i32.load align=1
    (local.get $2)
@@ -2174,14 +2366,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i32.load align=2
    (local.get $2)
@@ -2211,14 +2407,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 3)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i32.load
    (local.get $2)
@@ -2248,7 +2448,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.load8_s
    (local.get $2)
@@ -2278,7 +2480,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.load8_u
    (local.get $2)
@@ -2308,7 +2512,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.load16_s align=1
    (local.get $2)
@@ -2338,14 +2544,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.load16_s
    (local.get $2)
@@ -2375,7 +2585,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.load16_u align=1
    (local.get $2)
@@ -2405,14 +2617,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.load16_u
    (local.get $2)
@@ -2442,7 +2658,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.load32_s align=1
    (local.get $2)
@@ -2472,14 +2690,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.load32_s align=2
    (local.get $2)
@@ -2509,14 +2731,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 3)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.load32_s
    (local.get $2)
@@ -2546,7 +2772,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.load32_u align=1
    (local.get $2)
@@ -2576,14 +2804,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.load32_u align=2
    (local.get $2)
@@ -2613,14 +2845,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 3)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.load32_u
    (local.get $2)
@@ -2650,7 +2886,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.load align=1
    (local.get $2)
@@ -2680,14 +2918,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.load align=2
    (local.get $2)
@@ -2717,14 +2959,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 3)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.load align=4
    (local.get $2)
@@ -2754,14 +3000,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 7)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.load
    (local.get $2)
@@ -2791,7 +3041,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (f32.load align=1
    (local.get $2)
@@ -2821,14 +3073,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (f32.load align=2
    (local.get $2)
@@ -2858,14 +3114,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 3)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (f32.load
    (local.get $2)
@@ -2895,7 +3155,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (f64.load align=1
    (local.get $2)
@@ -2925,14 +3187,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (f64.load align=2
    (local.get $2)
@@ -2962,14 +3228,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 3)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (f64.load align=4
    (local.get $2)
@@ -2999,14 +3269,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 7)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (f64.load
    (local.get $2)
@@ -3036,7 +3310,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i32.store8
    (local.get $3)
@@ -3067,7 +3343,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i32.store16 align=1
    (local.get $3)
@@ -3098,14 +3376,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i32.store16
    (local.get $3)
@@ -3136,7 +3418,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i32.store align=1
    (local.get $3)
@@ -3167,14 +3451,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i32.store align=2
    (local.get $3)
@@ -3205,14 +3493,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 3)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i32.store
    (local.get $3)
@@ -3243,7 +3535,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.store8
    (local.get $3)
@@ -3274,7 +3568,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.store16 align=1
    (local.get $3)
@@ -3305,14 +3601,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.store16
    (local.get $3)
@@ -3343,7 +3643,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.store32 align=1
    (local.get $3)
@@ -3374,14 +3676,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.store32 align=2
    (local.get $3)
@@ -3412,14 +3718,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 3)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.store32
    (local.get $3)
@@ -3450,7 +3760,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.store align=1
    (local.get $3)
@@ -3481,14 +3793,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.store align=2
    (local.get $3)
@@ -3519,14 +3835,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 3)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.store align=4
    (local.get $3)
@@ -3557,14 +3877,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 7)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.store
    (local.get $3)
@@ -3595,7 +3919,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (f32.store align=1
    (local.get $3)
@@ -3626,14 +3952,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (f32.store align=2
    (local.get $3)
@@ -3664,14 +3994,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 3)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (f32.store
    (local.get $3)
@@ -3702,7 +4036,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (f64.store align=1
    (local.get $3)
@@ -3733,14 +4069,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (f64.store align=2
    (local.get $3)
@@ -3771,14 +4111,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 3)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (f64.store align=4
    (local.get $3)
@@ -3809,14 +4153,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 7)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (f64.store
    (local.get $3)
@@ -3871,7 +4219,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i32.load8_s
    (local.get $2)
@@ -3901,7 +4251,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i32.load8_u
    (local.get $2)
@@ -3931,7 +4283,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i32.load16_s align=1
    (local.get $2)
@@ -3961,14 +4315,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i32.load16_s
    (local.get $2)
@@ -3998,7 +4356,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i32.load16_u align=1
    (local.get $2)
@@ -4028,14 +4388,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i32.load16_u
    (local.get $2)
@@ -4065,7 +4429,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i32.load align=1
    (local.get $2)
@@ -4095,14 +4461,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i32.load align=2
    (local.get $2)
@@ -4132,14 +4502,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 3)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i32.load
    (local.get $2)
@@ -4169,7 +4543,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.load8_s
    (local.get $2)
@@ -4199,7 +4575,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.load8_u
    (local.get $2)
@@ -4229,7 +4607,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.load16_s align=1
    (local.get $2)
@@ -4259,14 +4639,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.load16_s
    (local.get $2)
@@ -4296,7 +4680,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.load16_u align=1
    (local.get $2)
@@ -4326,14 +4712,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.load16_u
    (local.get $2)
@@ -4363,7 +4753,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.load32_s align=1
    (local.get $2)
@@ -4393,14 +4785,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.load32_s align=2
    (local.get $2)
@@ -4430,14 +4826,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 3)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.load32_s
    (local.get $2)
@@ -4467,7 +4867,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.load32_u align=1
    (local.get $2)
@@ -4497,14 +4899,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.load32_u align=2
    (local.get $2)
@@ -4534,14 +4940,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 3)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.load32_u
    (local.get $2)
@@ -4571,7 +4981,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.load align=1
    (local.get $2)
@@ -4601,14 +5013,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.load align=2
    (local.get $2)
@@ -4638,14 +5054,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 3)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.load align=4
    (local.get $2)
@@ -4675,14 +5095,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 7)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.load
    (local.get $2)
@@ -4712,7 +5136,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (f32.load align=1
    (local.get $2)
@@ -4742,14 +5168,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (f32.load align=2
    (local.get $2)
@@ -4779,14 +5209,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 3)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (f32.load
    (local.get $2)
@@ -4816,7 +5250,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (f64.load align=1
    (local.get $2)
@@ -4846,14 +5282,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (f64.load align=2
    (local.get $2)
@@ -4883,14 +5323,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 3)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (f64.load align=4
    (local.get $2)
@@ -4920,14 +5364,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 7)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (f64.load
    (local.get $2)
@@ -4957,7 +5405,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i32.store8
    (local.get $3)
@@ -4988,7 +5438,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i32.store16 align=1
    (local.get $3)
@@ -5019,14 +5471,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i32.store16
    (local.get $3)
@@ -5057,7 +5513,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i32.store align=1
    (local.get $3)
@@ -5088,14 +5546,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i32.store align=2
    (local.get $3)
@@ -5126,14 +5588,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 3)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i32.store
    (local.get $3)
@@ -5164,7 +5630,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.store8
    (local.get $3)
@@ -5195,7 +5663,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.store16 align=1
    (local.get $3)
@@ -5226,14 +5696,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.store16
    (local.get $3)
@@ -5264,7 +5738,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.store32 align=1
    (local.get $3)
@@ -5295,14 +5771,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.store32 align=2
    (local.get $3)
@@ -5333,14 +5813,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 3)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.store32
    (local.get $3)
@@ -5371,7 +5855,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.store align=1
    (local.get $3)
@@ -5402,14 +5888,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.store align=2
    (local.get $3)
@@ -5440,14 +5930,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 3)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.store align=4
    (local.get $3)
@@ -5478,14 +5972,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 7)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.store
    (local.get $3)
@@ -5516,7 +6014,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (f32.store align=1
    (local.get $3)
@@ -5547,14 +6047,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (f32.store align=2
    (local.get $3)
@@ -5585,14 +6089,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 3)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (f32.store
    (local.get $3)
@@ -5623,7 +6131,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (f64.store align=1
    (local.get $3)
@@ -5654,14 +6164,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (f64.store align=2
    (local.get $3)
@@ -5692,14 +6206,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 3)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (f64.store align=4
    (local.get $3)
@@ -5730,14 +6248,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 7)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (f64.store
    (local.get $3)