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, 1137 insertions, 379 deletions

diff --git a/test/passes/safe-heap_low-memory-unused_enable-threads_enable-simd.txt b/test/passes/safe-heap_low-memory-unused_enable-threads_enable-simd.txt
index 53b048331..02904abad 100644
--- a/test/passes/safe-heap_low-memory-unused_enable-threads_enable-simd.txt
+++ b/test/passes/safe-heap_low-memory-unused_enable-threads_enable-simd.txt
@@ -208,7 +208,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i32.shr_s
    (i32.shl
@@ -244,7 +246,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i32.load8_s
    (local.get $2)
@@ -274,7 +278,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i32.atomic.load8_u
    (local.get $2)
@@ -304,7 +310,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i32.load8_u
    (local.get $2)
@@ -334,7 +342,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i32.load16_s align=1
    (local.get $2)
@@ -364,14 +374,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i32.shr_s
    (i32.shl
@@ -407,14 +421,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)
@@ -444,7 +462,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i32.load16_u align=1
    (local.get $2)
@@ -474,14 +494,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i32.atomic.load16_u
    (local.get $2)
@@ -511,14 +535,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)
@@ -548,7 +576,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i32.load align=1
    (local.get $2)
@@ -578,14 +608,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)
@@ -615,14 +649,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 3)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i32.atomic.load
    (local.get $2)
@@ -652,14 +690,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)
@@ -689,7 +731,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.shr_s
    (i64.shl
@@ -725,7 +769,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.load8_s
    (local.get $2)
@@ -755,7 +801,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.atomic.load8_u
    (local.get $2)
@@ -785,7 +833,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.load8_u
    (local.get $2)
@@ -815,7 +865,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.load16_s align=1
    (local.get $2)
@@ -845,14 +897,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.shr_s
    (i64.shl
@@ -888,14 +944,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)
@@ -925,7 +985,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.load16_u align=1
    (local.get $2)
@@ -955,14 +1017,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.atomic.load16_u
    (local.get $2)
@@ -992,14 +1058,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)
@@ -1029,7 +1099,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.load32_s align=1
    (local.get $2)
@@ -1059,14 +1131,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)
@@ -1096,14 +1172,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 3)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.shr_s
    (i64.shl
@@ -1139,14 +1219,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)
@@ -1176,7 +1260,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.load32_u align=1
    (local.get $2)
@@ -1206,14 +1292,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)
@@ -1243,14 +1333,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 3)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.atomic.load32_u
    (local.get $2)
@@ -1280,14 +1374,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)
@@ -1317,7 +1415,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.load align=1
    (local.get $2)
@@ -1347,14 +1447,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)
@@ -1384,14 +1488,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)
@@ -1421,14 +1529,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 7)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.atomic.load
    (local.get $2)
@@ -1458,14 +1570,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)
@@ -1495,7 +1611,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (f32.load align=1
    (local.get $2)
@@ -1525,14 +1643,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)
@@ -1562,14 +1684,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)
@@ -1599,7 +1725,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (f64.load align=1
    (local.get $2)
@@ -1629,14 +1757,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)
@@ -1666,14 +1798,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)
@@ -1703,14 +1839,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)
@@ -1740,7 +1880,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (v128.load align=1
    (local.get $2)
@@ -1770,14 +1912,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (v128.load align=2
    (local.get $2)
@@ -1807,14 +1953,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 3)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (v128.load align=4
    (local.get $2)
@@ -1844,14 +1994,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 7)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (v128.load align=8
    (local.get $2)
@@ -1881,14 +2035,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 15)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (v128.load
    (local.get $2)
@@ -1918,7 +2076,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i32.atomic.store8
    (local.get $3)
@@ -1949,7 +2109,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i32.store8
    (local.get $3)
@@ -1980,7 +2142,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i32.store16 align=1
    (local.get $3)
@@ -2011,14 +2175,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i32.atomic.store16
    (local.get $3)
@@ -2049,14 +2217,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)
@@ -2087,7 +2259,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i32.store align=1
    (local.get $3)
@@ -2118,14 +2292,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)
@@ -2156,14 +2334,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 3)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i32.atomic.store
    (local.get $3)
@@ -2194,14 +2376,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)
@@ -2232,7 +2418,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.atomic.store8
    (local.get $3)
@@ -2263,7 +2451,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.store8
    (local.get $3)
@@ -2294,7 +2484,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.store16 align=1
    (local.get $3)
@@ -2325,14 +2517,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.atomic.store16
    (local.get $3)
@@ -2363,14 +2559,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)
@@ -2401,7 +2601,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.store32 align=1
    (local.get $3)
@@ -2432,14 +2634,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)
@@ -2470,14 +2676,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 3)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.atomic.store32
    (local.get $3)
@@ -2508,14 +2718,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)
@@ -2546,7 +2760,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.store align=1
    (local.get $3)
@@ -2577,14 +2793,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)
@@ -2615,14 +2835,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)
@@ -2653,14 +2877,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 7)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.atomic.store
    (local.get $3)
@@ -2691,14 +2919,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)
@@ -2729,7 +2961,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (f32.store align=1
    (local.get $3)
@@ -2760,14 +2994,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)
@@ -2798,14 +3036,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)
@@ -2836,7 +3078,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (f64.store align=1
    (local.get $3)
@@ -2867,14 +3111,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)
@@ -2905,14 +3153,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)
@@ -2943,14 +3195,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)
@@ -2981,7 +3237,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (v128.store align=1
    (local.get $3)
@@ -3012,14 +3270,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (v128.store align=2
    (local.get $3)
@@ -3050,14 +3312,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 3)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (v128.store align=4
    (local.get $3)
@@ -3088,14 +3354,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 7)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (v128.store align=8
    (local.get $3)
@@ -3126,14 +3396,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 15)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (v128.store
    (local.get $3)
@@ -3190,7 +3464,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i32.load8_s
    (local.get $2)
@@ -3220,7 +3496,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i32.load8_u
    (local.get $2)
@@ -3250,7 +3528,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i32.load16_s align=1
    (local.get $2)
@@ -3280,14 +3560,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)
@@ -3317,7 +3601,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i32.load16_u align=1
    (local.get $2)
@@ -3347,14 +3633,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)
@@ -3384,7 +3674,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i32.load align=1
    (local.get $2)
@@ -3414,14 +3706,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)
@@ -3451,14 +3747,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)
@@ -3488,7 +3788,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.load8_s
    (local.get $2)
@@ -3518,7 +3820,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.load8_u
    (local.get $2)
@@ -3548,7 +3852,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.load16_s align=1
    (local.get $2)
@@ -3578,14 +3884,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)
@@ -3615,7 +3925,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.load16_u align=1
    (local.get $2)
@@ -3645,14 +3957,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)
@@ -3682,7 +3998,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.load32_s align=1
    (local.get $2)
@@ -3712,14 +4030,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)
@@ -3749,14 +4071,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)
@@ -3786,7 +4112,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.load32_u align=1
    (local.get $2)
@@ -3816,14 +4144,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)
@@ -3853,14 +4185,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)
@@ -3890,7 +4226,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.load align=1
    (local.get $2)
@@ -3920,14 +4258,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)
@@ -3957,14 +4299,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)
@@ -3994,14 +4340,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)
@@ -4031,7 +4381,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (f32.load align=1
    (local.get $2)
@@ -4061,14 +4413,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)
@@ -4098,14 +4454,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)
@@ -4135,7 +4495,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (f64.load align=1
    (local.get $2)
@@ -4165,14 +4527,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)
@@ -4202,14 +4568,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)
@@ -4239,14 +4609,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)
@@ -4276,7 +4650,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (v128.load align=1
    (local.get $2)
@@ -4306,14 +4682,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (v128.load align=2
    (local.get $2)
@@ -4343,14 +4723,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 3)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (v128.load align=4
    (local.get $2)
@@ -4380,14 +4764,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 7)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (v128.load align=8
    (local.get $2)
@@ -4417,14 +4805,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 15)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (v128.load
    (local.get $2)
@@ -4454,7 +4846,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i32.store8
    (local.get $3)
@@ -4485,7 +4879,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i32.store16 align=1
    (local.get $3)
@@ -4516,14 +4912,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)
@@ -4554,7 +4954,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i32.store align=1
    (local.get $3)
@@ -4585,14 +4987,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)
@@ -4623,14 +5029,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)
@@ -4661,7 +5071,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.store8
    (local.get $3)
@@ -4692,7 +5104,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.store16 align=1
    (local.get $3)
@@ -4723,14 +5137,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)
@@ -4761,7 +5179,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.store32 align=1
    (local.get $3)
@@ -4792,14 +5212,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)
@@ -4830,14 +5254,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)
@@ -4868,7 +5296,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.store align=1
    (local.get $3)
@@ -4899,14 +5329,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)
@@ -4937,14 +5371,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)
@@ -4975,14 +5413,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)
@@ -5013,7 +5455,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (f32.store align=1
    (local.get $3)
@@ -5044,14 +5488,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)
@@ -5082,14 +5530,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)
@@ -5120,7 +5572,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (f64.store align=1
    (local.get $3)
@@ -5151,14 +5605,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)
@@ -5189,14 +5647,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)
@@ -5227,14 +5689,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)
@@ -5265,7 +5731,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (v128.store align=1
    (local.get $3)
@@ -5296,14 +5764,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (v128.store align=2
    (local.get $3)
@@ -5334,14 +5806,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 3)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (v128.store align=4
    (local.get $3)
@@ -5372,14 +5848,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 7)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (v128.store align=8
    (local.get $3)
@@ -5410,14 +5890,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 15)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (v128.store
    (local.get $3)
@@ -5479,7 +5963,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i32.shr_s
    (i32.shl
@@ -5515,7 +6001,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i32.load8_s
    (local.get $2)
@@ -5545,7 +6033,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i32.atomic.load8_u
    (local.get $2)
@@ -5575,7 +6065,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i32.load8_u
    (local.get $2)
@@ -5605,7 +6097,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i32.load16_s align=1
    (local.get $2)
@@ -5635,14 +6129,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i32.shr_s
    (i32.shl
@@ -5678,14 +6176,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)
@@ -5715,7 +6217,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i32.load16_u align=1
    (local.get $2)
@@ -5745,14 +6249,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i32.atomic.load16_u
    (local.get $2)
@@ -5782,14 +6290,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)
@@ -5819,7 +6331,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i32.load align=1
    (local.get $2)
@@ -5849,14 +6363,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)
@@ -5886,14 +6404,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 3)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i32.atomic.load
    (local.get $2)
@@ -5923,14 +6445,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)
@@ -5960,7 +6486,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.shr_s
    (i64.shl
@@ -5996,7 +6524,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.load8_s
    (local.get $2)
@@ -6026,7 +6556,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.atomic.load8_u
    (local.get $2)
@@ -6056,7 +6588,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.load8_u
    (local.get $2)
@@ -6086,7 +6620,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.load16_s align=1
    (local.get $2)
@@ -6116,14 +6652,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.shr_s
    (i64.shl
@@ -6159,14 +6699,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)
@@ -6196,7 +6740,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.load16_u align=1
    (local.get $2)
@@ -6226,14 +6772,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.atomic.load16_u
    (local.get $2)
@@ -6263,14 +6813,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)
@@ -6300,7 +6854,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.load32_s align=1
    (local.get $2)
@@ -6330,14 +6886,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)
@@ -6367,14 +6927,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 3)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.shr_s
    (i64.shl
@@ -6410,14 +6974,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)
@@ -6447,7 +7015,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.load32_u align=1
    (local.get $2)
@@ -6477,14 +7047,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)
@@ -6514,14 +7088,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 3)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.atomic.load32_u
    (local.get $2)
@@ -6551,14 +7129,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)
@@ -6588,7 +7170,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.load align=1
    (local.get $2)
@@ -6618,14 +7202,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)
@@ -6655,14 +7243,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)
@@ -6692,14 +7284,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 7)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.atomic.load
    (local.get $2)
@@ -6729,14 +7325,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)
@@ -6766,7 +7366,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (f32.load align=1
    (local.get $2)
@@ -6796,14 +7398,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)
@@ -6833,14 +7439,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)
@@ -6870,7 +7480,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (f64.load align=1
    (local.get $2)
@@ -6900,14 +7512,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)
@@ -6937,14 +7553,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)
@@ -6974,14 +7594,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)
@@ -7011,7 +7635,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (v128.load align=1
    (local.get $2)
@@ -7041,14 +7667,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (v128.load align=2
    (local.get $2)
@@ -7078,14 +7708,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 3)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (v128.load align=4
    (local.get $2)
@@ -7115,14 +7749,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 7)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (v128.load align=8
    (local.get $2)
@@ -7152,14 +7790,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $2)
     (i32.const 15)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (v128.load
    (local.get $2)
@@ -7189,7 +7831,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i32.atomic.store8
    (local.get $3)
@@ -7220,7 +7864,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i32.store8
    (local.get $3)
@@ -7251,7 +7897,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i32.store16 align=1
    (local.get $3)
@@ -7282,14 +7930,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i32.atomic.store16
    (local.get $3)
@@ -7320,14 +7972,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)
@@ -7358,7 +8014,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i32.store align=1
    (local.get $3)
@@ -7389,14 +8047,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)
@@ -7427,14 +8089,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 3)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i32.atomic.store
    (local.get $3)
@@ -7465,14 +8131,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)
@@ -7503,7 +8173,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.atomic.store8
    (local.get $3)
@@ -7534,7 +8206,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.store8
    (local.get $3)
@@ -7565,7 +8239,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.store16 align=1
    (local.get $3)
@@ -7596,14 +8272,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.atomic.store16
    (local.get $3)
@@ -7634,14 +8314,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)
@@ -7672,7 +8356,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.store32 align=1
    (local.get $3)
@@ -7703,14 +8389,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)
@@ -7741,14 +8431,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 3)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.atomic.store32
    (local.get $3)
@@ -7779,14 +8473,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)
@@ -7817,7 +8515,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (i64.store align=1
    (local.get $3)
@@ -7848,14 +8548,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)
@@ -7886,14 +8590,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)
@@ -7924,14 +8632,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 7)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (i64.atomic.store
    (local.get $3)
@@ -7962,14 +8674,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)
@@ -8000,7 +8716,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (f32.store align=1
    (local.get $3)
@@ -8031,14 +8749,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)
@@ -8069,14 +8791,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)
@@ -8107,7 +8833,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (f64.store align=1
    (local.get $3)
@@ -8138,14 +8866,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)
@@ -8176,14 +8908,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)
@@ -8214,14 +8950,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)
@@ -8252,7 +8992,9 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (v128.store align=1
    (local.get $3)
@@ -8283,14 +9025,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 1)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (v128.store align=2
    (local.get $3)
@@ -8321,14 +9067,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 3)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (v128.store align=4
    (local.get $3)
@@ -8359,14 +9109,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 7)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (v128.store align=8
    (local.get $3)
@@ -8397,14 +9151,18 @@
      )
     )
    )
-   (call $segfault)
+   (then
+    (call $segfault)
+   )
   )
   (if
    (i32.and
     (local.get $3)
     (i32.const 15)
    )
-   (call $alignfault)
+   (then
+    (call $alignfault)
+   )
   )
   (v128.store
    (local.get $3)