diff --git a/src/builtins.ts b/src/builtins.ts
index e2027b4d9c..e9f563e1e6 100644
--- a/src/builtins.ts
+++ b/src/builtins.ts
@@ -143,8 +143,6 @@ export namespace BuiltinNames {
   export const isManaged = "~lib/builtins/isManaged";
   export const isVoid = "~lib/builtins/isVoid";
 
-  export const bswap = "~lib/builtins/bswap";
-
   export const add = "~lib/builtins/add";
   export const sub = "~lib/builtins/sub";
   export const mul = "~lib/builtins/mul";
@@ -1193,181 +1191,6 @@ function builtin_idof(ctx: BuiltinFunctionContext): ExpressionRef {
 }
 builtinFunctions.set(BuiltinNames.idof, builtin_idof);
 
-// bswap<T?>(value: T) -> T
-function builtin_bswap(ctx: BuiltinFunctionContext): ExpressionRef {
-  let compiler = ctx.compiler;
-  let module = compiler.module;
-  if (
-    checkTypeOptional(ctx, true) |
-    checkArgsRequired(ctx, 1)
-  ) return module.unreachable();
-
-  let typeArguments = ctx.typeArguments;
-  let arg0 = typeArguments
-    ? compiler.compileExpression(
-        ctx.operands[0],
-        typeArguments[0].toUnsigned(),
-        Constraints.ConvImplicit | Constraints.MustWrap
-      )
-    : compiler.compileExpression(
-        ctx.operands[0],
-        Type.u32,
-        Constraints.MustWrap
-      );
-
-  let type = compiler.currentType;
-  if (type.isValue) {
-    switch (type.kind) {
-      case TypeKind.Bool:
-      case TypeKind.I8:
-      case TypeKind.U8: return arg0;
-      case TypeKind.I16:
-      case TypeKind.U16: {
-        // <T>(x << 8 | x >> 8)
-        let flow = compiler.currentFlow;
-        let temp = flow.getTempLocal(type);
-        flow.setLocalFlag(temp.index, LocalFlags.Wrapped);
-
-        let res = module.binary(
-          BinaryOp.OrI32,
-          module.binary(
-            BinaryOp.ShlI32,
-            module.local_tee(temp.index, arg0, false),
-            module.i32(8)
-          ),
-          module.binary(
-            BinaryOp.ShrU32,
-            module.local_get(temp.index, TypeRef.I32),
-            module.i32(8)
-          )
-        );
-        // avoid wrapping for u16 due to it's already done for input arg
-        if (type.kind == TypeKind.I16) {
-          res = compiler.ensureSmallIntegerWrap(res, Type.i16);
-        }
-        return res;
-      }
-      case TypeKind.I32:
-      case TypeKind.U32:
-      case TypeKind.Isize:
-      case TypeKind.Usize: {
-        if (type.size == 32) {
-          // rotl(x & 0xFF00FF00, 8) | rotr(x & 0x00FF00FF, 8)
-          let flow = compiler.currentFlow;
-          let temp = flow.getTempLocal(type);
-          flow.setLocalFlag(temp.index, LocalFlags.Wrapped);
-
-          let res = module.binary(
-            BinaryOp.OrI32,
-            module.binary(
-              BinaryOp.RotlI32,
-              module.binary(
-                BinaryOp.AndI32,
-                module.local_tee(temp.index, arg0, false),
-                module.i32(0xFF00FF00)
-              ),
-              module.i32(8)
-            ),
-            module.binary(
-              BinaryOp.RotrI32,
-              module.binary(
-                BinaryOp.AndI32,
-                module.local_get(temp.index, TypeRef.I32),
-                module.i32(0x00FF00FF)
-              ),
-              module.i32(8)
-            ),
-          );
-          return res;
-        }
-        // fall-through
-      }
-      case TypeKind.I64:
-      case TypeKind.U64: {
-        // let t =
-        //   ((x >>> 8) & 0x00FF00FF00FF00FF) |
-        //   ((x & 0x00FF00FF00FF00FF) << 8)
-        //
-        // let res =
-        //   ((t >>> 16) & 0x0000FFFF0000FFFF) |
-        //   ((t & 0x0000FFFF0000FFFF) << 16)
-        //
-        // rotr(res, 32)
-
-        let flow = compiler.currentFlow;
-        let temp1 = flow.getTempLocal(type);
-        flow.setLocalFlag(temp1.index, LocalFlags.Wrapped);
-        let temp2 = flow.getTempLocal(type);
-        flow.setLocalFlag(temp2.index, LocalFlags.Wrapped);
-
-        // t = ((x >>> 8) & 0x00FF00FF00FF00FF) | ((x & 0x00FF00FF00FF00FF) << 8)
-        let expr = module.local_tee(
-          temp2.index,
-          module.binary(
-            BinaryOp.OrI64,
-            module.binary(
-              BinaryOp.AndI64,
-              module.binary(
-                BinaryOp.ShrU64,
-                module.local_tee(temp1.index, arg0, false),
-                module.i64(8)
-              ),
-              module.i64(0x00FF00FF, 0x00FF00FF)
-            ),
-            module.binary(
-              BinaryOp.ShlI64,
-              module.binary(
-                BinaryOp.AndI64,
-                module.local_get(temp1.index, TypeRef.I64),
-                module.i64(0x00FF00FF, 0x00FF00FF)
-              ),
-              module.i64(8)
-            ),
-          ),
-          false
-        );
-
-        // ((t >>> 16) & 0x0000FFFF0000FFFF) | ((t & 0x0000FFFF0000FFFF) << 16)
-        let res = module.binary(
-          BinaryOp.OrI64,
-          module.binary(
-            BinaryOp.AndI64,
-            module.binary(
-              BinaryOp.ShrU64,
-              expr,
-              module.i64(16)
-            ),
-            module.i64(0x0000FFFF, 0x0000FFFF)
-          ),
-          module.binary(
-            BinaryOp.ShlI64,
-            module.binary(
-              BinaryOp.AndI64,
-              module.local_get(temp2.index, TypeRef.I64),
-              module.i64(0x0000FFFF, 0x0000FFFF)
-            ),
-            module.i64(16)
-          ),
-        );
-
-        // rotr(res, 32)
-        res = module.binary(
-          BinaryOp.RotrI64,
-          res,
-          module.i64(32)
-        );
-        return res;
-      }
-    }
-  }
-  compiler.error(
-    DiagnosticCode.Operation_0_cannot_be_applied_to_type_1,
-    ctx.reportNode.typeArgumentsRange, "bswap", type.toString()
-  );
-  return module.unreachable();
-}
-builtinFunctions.set(BuiltinNames.bswap, builtin_bswap);
-
 // === Math ===================================================================================
 
 // NaN
diff --git a/std/assembly/builtins.ts b/std/assembly/builtins.ts
index ef81c80a02..0f910a39e4 100644
--- a/std/assembly/builtins.ts
+++ b/std/assembly/builtins.ts
@@ -66,10 +66,6 @@ export declare function isVoid<T>(): bool;
 @builtin
 export declare function lengthof<T>(func?: T): i32;
 
-// @ts-ignore
-@builtin
-export declare function bswap<T>(value: T): T;
-
 // @ts-ignore: decorator
 @builtin
 export declare function clz<T>(value: T): T;
diff --git a/std/assembly/polyfills.ts b/std/assembly/polyfills.ts
new file mode 100644
index 0000000000..2f39f1f207
--- /dev/null
+++ b/std/assembly/polyfills.ts
@@ -0,0 +1,27 @@
+export function bswap<T extends number>(value: T): T {
+  if (isInteger<T>()) {
+    if (sizeof<T>() == 1) {
+      return value;
+    }
+    if (sizeof<T>() == 2) {
+      return <T>(<u16>value << 8 | (<u16>value >> 8));
+    }
+    if (sizeof<T>() == 4) {
+      return <T>(
+        rotl(<u32>value & 0xFF00FF00, 8) |
+        rotr(<u32>value & 0x00FF00FF, 8)
+      );
+    }
+    if (sizeof<T>() == 8) {
+      let a = (<u64>value >> 8) & 0x00FF00FF00FF00FF;
+      let b = (<u64>value & 0x00FF00FF00FF00FF) << 8;
+      let v = a | b;
+
+      a = (v >>> 16) & 0x0000FFFF0000FFFF;
+      b = (v & 0x0000FFFF0000FFFF) << 16;
+
+      return <T>rotr(a | b, 32);
+    }
+  }
+  ERROR("Unsupported generic type");
+}
diff --git a/tests/compiler/builtins.debug.wat b/tests/compiler/builtins.debug.wat
index 6261e34723..fd352cf9b9 100644
--- a/tests/compiler/builtins.debug.wat
+++ b/tests/compiler/builtins.debug.wat
@@ -551,16 +551,6 @@
   (local $51 i32)
   (local $52 i32)
   (local $53 i32)
-  (local $54 i32)
-  (local $55 i32)
-  (local $56 i32)
-  (local $57 i64)
-  (local $58 i64)
-  (local $59 i64)
-  (local $60 i64)
-  (local $61 i32)
-  (local $62 i32)
-  (local $63 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
   i32.sub
@@ -2543,11 +2533,11 @@
   i32.const 2
   i32.const 3
   global.get $builtins/fn
-  local.set $63
+  local.set $53
   global.get $~lib/memory/__stack_pointer
-  local.get $63
+  local.get $53
   i32.store $0
-  local.get $63
+  local.get $53
   call $~lib/function/Function<%28i32%2Ci32%29=>i32>#get:index
   call_indirect $0 (type $i32_i32_=>_i32)
   i32.eq
@@ -2561,23 +2551,23 @@
    unreachable
   end
   global.get $builtins/fn
-  local.set $63
+  local.set $53
   global.get $~lib/memory/__stack_pointer
-  local.get $63
+  local.get $53
   i32.store $0 offset=8
-  local.get $63
+  local.get $53
   call $~lib/function/Function<%28i32%2Ci32%29=>i32>#get:name
-  local.set $63
+  local.set $53
   global.get $~lib/memory/__stack_pointer
-  local.get $63
+  local.get $53
   i32.store $0
-  local.get $63
+  local.get $53
   i32.const 32
-  local.set $63
+  local.set $53
   global.get $~lib/memory/__stack_pointer
-  local.get $63
+  local.get $53
   i32.store $0 offset=4
-  local.get $63
+  local.get $53
   call $~lib/string/String.__eq
   i32.eqz
   if
@@ -2589,11 +2579,11 @@
    unreachable
   end
   global.get $builtins/fn
-  local.set $63
+  local.set $53
   global.get $~lib/memory/__stack_pointer
-  local.get $63
+  local.get $53
   i32.store $0
-  local.get $63
+  local.get $53
   call $~lib/function/Function<%28i32%2Ci32%29=>i32>#get:length
   i32.const 2
   i32.eq
@@ -2607,11 +2597,11 @@
    unreachable
   end
   global.get $builtins/fn
-  local.set $63
+  local.set $53
   global.get $~lib/memory/__stack_pointer
-  local.get $63
+  local.get $53
   i32.store $0
-  local.get $63
+  local.get $53
   call $~lib/function/Function<%28i32%2Ci32%29=>i32>#get:length
   i32.const 2
   i32.eq
@@ -2625,23 +2615,23 @@
    unreachable
   end
   global.get $builtins/fn
-  local.set $63
+  local.set $53
   global.get $~lib/memory/__stack_pointer
-  local.get $63
+  local.get $53
   i32.store $0 offset=8
-  local.get $63
+  local.get $53
   call $~lib/function/Function<%28i32%2Ci32%29=>i32>#toString
-  local.set $63
+  local.set $53
   global.get $~lib/memory/__stack_pointer
-  local.get $63
+  local.get $53
   i32.store $0
-  local.get $63
+  local.get $53
   i32.const 176
-  local.set $63
+  local.set $53
   global.get $~lib/memory/__stack_pointer
-  local.get $63
+  local.get $53
   i32.store $0 offset=4
-  local.get $63
+  local.get $53
   call $~lib/string/String.__eq
   i32.eqz
   if
@@ -3283,11 +3273,11 @@
   i32.const 52
   local.set $52
   i32.const 256
-  local.set $63
+  local.set $53
   global.get $~lib/memory/__stack_pointer
-  local.get $63
+  local.get $53
   i32.store $0
-  local.get $63
+  local.get $53
   i32.const 5
   local.get $48
   f64.convert_i32_u
@@ -3349,17 +3339,17 @@
    unreachable
   end
   i32.const 352
-  local.set $63
+  local.set $53
   global.get $~lib/memory/__stack_pointer
-  local.get $63
+  local.get $53
   i32.store $0
-  local.get $63
+  local.get $53
   i32.const 352
-  local.set $63
+  local.set $53
   global.get $~lib/memory/__stack_pointer
-  local.get $63
+  local.get $53
   i32.store $0 offset=4
-  local.get $63
+  local.get $53
   call $~lib/string/String.__eq
   i32.eqz
   if
@@ -3371,17 +3361,17 @@
    unreachable
   end
   i32.const 352
-  local.set $63
+  local.set $53
   global.get $~lib/memory/__stack_pointer
-  local.get $63
+  local.get $53
   i32.store $0
-  local.get $63
+  local.get $53
   i32.const 352
-  local.set $63
+  local.set $53
   global.get $~lib/memory/__stack_pointer
-  local.get $63
+  local.get $53
   i32.store $0 offset=4
-  local.get $63
+  local.get $53
   call $~lib/string/String.__eq
   i32.eqz
   if
@@ -3393,17 +3383,17 @@
    unreachable
   end
   i32.const 400
-  local.set $63
+  local.set $53
   global.get $~lib/memory/__stack_pointer
-  local.get $63
+  local.get $53
   i32.store $0
-  local.get $63
+  local.get $53
   i32.const 400
-  local.set $63
+  local.set $53
   global.get $~lib/memory/__stack_pointer
-  local.get $63
+  local.get $53
   i32.store $0 offset=4
-  local.get $63
+  local.get $53
   call $~lib/string/String.__eq
   i32.eqz
   if
@@ -3415,17 +3405,17 @@
    unreachable
   end
   i32.const 432
-  local.set $63
+  local.set $53
   global.get $~lib/memory/__stack_pointer
-  local.get $63
+  local.get $53
   i32.store $0
-  local.get $63
+  local.get $53
   i32.const 432
-  local.set $63
+  local.set $53
   global.get $~lib/memory/__stack_pointer
-  local.get $63
+  local.get $53
   i32.store $0 offset=4
-  local.get $63
+  local.get $53
   call $~lib/string/String.__eq
   i32.eqz
   if
@@ -3437,17 +3427,17 @@
    unreachable
   end
   i32.const 464
-  local.set $63
+  local.set $53
   global.get $~lib/memory/__stack_pointer
-  local.get $63
+  local.get $53
   i32.store $0
-  local.get $63
+  local.get $53
   i32.const 464
-  local.set $63
+  local.set $53
   global.get $~lib/memory/__stack_pointer
-  local.get $63
+  local.get $53
   i32.store $0 offset=4
-  local.get $63
+  local.get $53
   call $~lib/string/String.__eq
   i32.eqz
   if
@@ -3459,17 +3449,17 @@
    unreachable
   end
   i32.const 496
-  local.set $63
+  local.set $53
   global.get $~lib/memory/__stack_pointer
-  local.get $63
+  local.get $53
   i32.store $0
-  local.get $63
+  local.get $53
   i32.const 496
-  local.set $63
+  local.set $53
   global.get $~lib/memory/__stack_pointer
-  local.get $63
+  local.get $53
   i32.store $0 offset=4
-  local.get $63
+  local.get $53
   call $~lib/string/String.__eq
   i32.eqz
   if
@@ -3481,17 +3471,17 @@
    unreachable
   end
   i32.const 528
-  local.set $63
+  local.set $53
   global.get $~lib/memory/__stack_pointer
-  local.get $63
+  local.get $53
   i32.store $0
-  local.get $63
+  local.get $53
   i32.const 528
-  local.set $63
+  local.set $53
   global.get $~lib/memory/__stack_pointer
-  local.get $63
+  local.get $53
   i32.store $0 offset=4
-  local.get $63
+  local.get $53
   call $~lib/string/String.__eq
   i32.eqz
   if
@@ -3503,17 +3493,17 @@
    unreachable
   end
   i32.const 560
-  local.set $63
+  local.set $53
   global.get $~lib/memory/__stack_pointer
-  local.get $63
+  local.get $53
   i32.store $0
-  local.get $63
+  local.get $53
   i32.const 560
-  local.set $63
+  local.set $53
   global.get $~lib/memory/__stack_pointer
-  local.get $63
+  local.get $53
   i32.store $0 offset=4
-  local.get $63
+  local.get $53
   call $~lib/string/String.__eq
   i32.eqz
   if
@@ -3525,17 +3515,17 @@
    unreachable
   end
   i32.const 592
-  local.set $63
+  local.set $53
   global.get $~lib/memory/__stack_pointer
-  local.get $63
+  local.get $53
   i32.store $0
-  local.get $63
+  local.get $53
   i32.const 592
-  local.set $63
+  local.set $53
   global.get $~lib/memory/__stack_pointer
-  local.get $63
+  local.get $53
   i32.store $0 offset=4
-  local.get $63
+  local.get $53
   call $~lib/string/String.__eq
   i32.eqz
   if
@@ -3547,17 +3537,17 @@
    unreachable
   end
   i32.const 624
-  local.set $63
+  local.set $53
   global.get $~lib/memory/__stack_pointer
-  local.get $63
+  local.get $53
   i32.store $0
-  local.get $63
+  local.get $53
   i32.const 624
-  local.set $63
+  local.set $53
   global.get $~lib/memory/__stack_pointer
-  local.get $63
+  local.get $53
   i32.store $0 offset=4
-  local.get $63
+  local.get $53
   call $~lib/string/String.__eq
   i32.eqz
   if
@@ -3569,17 +3559,17 @@
    unreachable
   end
   i32.const 656
-  local.set $63
+  local.set $53
   global.get $~lib/memory/__stack_pointer
-  local.get $63
+  local.get $53
   i32.store $0
-  local.get $63
+  local.get $53
   i32.const 656
-  local.set $63
+  local.set $53
   global.get $~lib/memory/__stack_pointer
-  local.get $63
+  local.get $53
   i32.store $0 offset=4
-  local.get $63
+  local.get $53
   call $~lib/string/String.__eq
   i32.eqz
   if
@@ -3591,17 +3581,17 @@
    unreachable
   end
   i32.const 688
-  local.set $63
+  local.set $53
   global.get $~lib/memory/__stack_pointer
-  local.get $63
+  local.get $53
   i32.store $0
-  local.get $63
+  local.get $53
   i32.const 688
-  local.set $63
+  local.set $53
   global.get $~lib/memory/__stack_pointer
-  local.get $63
+  local.get $53
   i32.store $0 offset=4
-  local.get $63
+  local.get $53
   call $~lib/string/String.__eq
   i32.eqz
   if
@@ -3613,17 +3603,17 @@
    unreachable
   end
   i32.const 720
-  local.set $63
+  local.set $53
   global.get $~lib/memory/__stack_pointer
-  local.get $63
+  local.get $53
   i32.store $0
-  local.get $63
+  local.get $53
   i32.const 720
-  local.set $63
+  local.set $53
   global.get $~lib/memory/__stack_pointer
-  local.get $63
+  local.get $53
   i32.store $0 offset=4
-  local.get $63
+  local.get $53
   call $~lib/string/String.__eq
   i32.eqz
   if
@@ -3635,17 +3625,17 @@
    unreachable
   end
   i32.const 752
-  local.set $63
+  local.set $53
   global.get $~lib/memory/__stack_pointer
-  local.get $63
+  local.get $53
   i32.store $0
-  local.get $63
+  local.get $53
   i32.const 752
-  local.set $63
+  local.set $53
   global.get $~lib/memory/__stack_pointer
-  local.get $63
+  local.get $53
   i32.store $0 offset=4
-  local.get $63
+  local.get $53
   call $~lib/string/String.__eq
   i32.eqz
   if
@@ -3657,17 +3647,17 @@
    unreachable
   end
   i32.const 784
-  local.set $63
+  local.set $53
   global.get $~lib/memory/__stack_pointer
-  local.get $63
+  local.get $53
   i32.store $0
-  local.get $63
+  local.get $53
   i32.const 784
-  local.set $63
+  local.set $53
   global.get $~lib/memory/__stack_pointer
-  local.get $63
+  local.get $53
   i32.store $0 offset=4
-  local.get $63
+  local.get $53
   call $~lib/string/String.__eq
   i32.eqz
   if
@@ -3679,17 +3669,17 @@
    unreachable
   end
   i32.const 816
-  local.set $63
+  local.set $53
   global.get $~lib/memory/__stack_pointer
-  local.get $63
+  local.get $53
   i32.store $0
-  local.get $63
+  local.get $53
   i32.const 816
-  local.set $63
+  local.set $53
   global.get $~lib/memory/__stack_pointer
-  local.get $63
+  local.get $53
   i32.store $0 offset=4
-  local.get $63
+  local.get $53
   call $~lib/string/String.__eq
   i32.eqz
   if
@@ -3701,17 +3691,17 @@
    unreachable
   end
   i32.const 848
-  local.set $63
+  local.set $53
   global.get $~lib/memory/__stack_pointer
-  local.get $63
+  local.get $53
   i32.store $0
-  local.get $63
+  local.get $53
   i32.const 848
-  local.set $63
+  local.set $53
   global.get $~lib/memory/__stack_pointer
-  local.get $63
+  local.get $53
   i32.store $0 offset=4
-  local.get $63
+  local.get $53
   call $~lib/string/String.__eq
   i32.eqz
   if
@@ -3723,17 +3713,17 @@
    unreachable
   end
   i32.const 880
-  local.set $63
+  local.set $53
   global.get $~lib/memory/__stack_pointer
-  local.get $63
+  local.get $53
   i32.store $0
-  local.get $63
+  local.get $53
   i32.const 880
-  local.set $63
+  local.set $53
   global.get $~lib/memory/__stack_pointer
-  local.get $63
+  local.get $53
   i32.store $0 offset=4
-  local.get $63
+  local.get $53
   call $~lib/string/String.__eq
   i32.eqz
   if
@@ -3745,17 +3735,17 @@
    unreachable
   end
   i32.const 432
-  local.set $63
+  local.set $53
   global.get $~lib/memory/__stack_pointer
-  local.get $63
+  local.get $53
   i32.store $0
-  local.get $63
+  local.get $53
   i32.const 432
-  local.set $63
+  local.set $53
   global.get $~lib/memory/__stack_pointer
-  local.get $63
+  local.get $53
   i32.store $0 offset=4
-  local.get $63
+  local.get $53
   call $~lib/string/String.__eq
   i32.eqz
   if
@@ -3767,17 +3757,17 @@
    unreachable
   end
   i32.const 352
-  local.set $63
+  local.set $53
   global.get $~lib/memory/__stack_pointer
-  local.get $63
+  local.get $53
   i32.store $0
-  local.get $63
+  local.get $53
   i32.const 352
-  local.set $63
+  local.set $53
   global.get $~lib/memory/__stack_pointer
-  local.get $63
+  local.get $53
   i32.store $0 offset=4
-  local.get $63
+  local.get $53
   call $~lib/string/String.__eq
   i32.eqz
   if
@@ -3914,162 +3904,6 @@
    call $~lib/builtins/abort
    unreachable
   end
-  i32.const 170
-  i32.const 170
-  i32.eq
-  drop
-  i32.const 170
-  i32.extend8_s
-  i32.const 255
-  i32.and
-  i32.const 170
-  i32.eq
-  drop
-  i32.const 43707
-  local.tee $53
-  i32.const 8
-  i32.shl
-  local.get $53
-  i32.const 8
-  i32.shr_u
-  i32.or
-  i32.const 65535
-  i32.and
-  i32.const 48042
-  i32.eq
-  drop
-  i32.const 43707
-  i32.extend16_s
-  i32.const 65535
-  i32.and
-  local.tee $54
-  i32.const 8
-  i32.shl
-  local.get $54
-  i32.const 8
-  i32.shr_u
-  i32.or
-  i32.const 65535
-  i32.and
-  i32.const 48042
-  i32.eq
-  drop
-  i32.const -1430532899
-  local.tee $55
-  i32.const -16711936
-  i32.and
-  i32.const 8
-  i32.rotl
-  local.get $55
-  i32.const 16711935
-  i32.and
-  i32.const 8
-  i32.rotr
-  i32.or
-  i32.const -573785174
-  i32.eq
-  drop
-  i32.const -1430532899
-  local.tee $56
-  i32.const -16711936
-  i32.and
-  i32.const 8
-  i32.rotl
-  local.get $56
-  i32.const 16711935
-  i32.and
-  i32.const 8
-  i32.rotr
-  i32.or
-  i32.const -573785174
-  i32.eq
-  drop
-  i64.const 4822679907192029
-  local.tee $57
-  i64.const 8
-  i64.shr_u
-  i64.const 71777214294589695
-  i64.and
-  local.get $57
-  i64.const 71777214294589695
-  i64.and
-  i64.const 8
-  i64.shl
-  i64.or
-  local.tee $58
-  i64.const 16
-  i64.shr_u
-  i64.const 281470681808895
-  i64.and
-  local.get $58
-  i64.const 281470681808895
-  i64.and
-  i64.const 16
-  i64.shl
-  i64.or
-  i64.const 32
-  i64.rotr
-  i64.const -2464388556401798912
-  i64.eq
-  drop
-  i64.const 4822679907192029
-  local.tee $59
-  i64.const 8
-  i64.shr_u
-  i64.const 71777214294589695
-  i64.and
-  local.get $59
-  i64.const 71777214294589695
-  i64.and
-  i64.const 8
-  i64.shl
-  i64.or
-  local.tee $60
-  i64.const 16
-  i64.shr_u
-  i64.const 281470681808895
-  i64.and
-  local.get $60
-  i64.const 281470681808895
-  i64.and
-  i64.const 16
-  i64.shl
-  i64.or
-  i64.const 32
-  i64.rotr
-  i64.const -2464388556401798912
-  i64.eq
-  drop
-  i32.const -1430532899
-  local.tee $61
-  i32.const -16711936
-  i32.and
-  i32.const 8
-  i32.rotl
-  local.get $61
-  i32.const 16711935
-  i32.and
-  i32.const 8
-  i32.rotr
-  i32.or
-  i32.const -573785174
-  i32.eq
-  drop
-  i32.const -1430532899
-  local.tee $62
-  i32.const -16711936
-  i32.and
-  i32.const 8
-  i32.rotl
-  local.get $62
-  i32.const 16711935
-  i32.and
-  i32.const 8
-  i32.rotr
-  i32.or
-  i32.const -573785174
-  i32.eq
-  drop
   global.get $~lib/memory/__stack_pointer
   i32.const 12
   i32.add
diff --git a/tests/compiler/builtins.ts b/tests/compiler/builtins.ts
index 35c680b763..dafb8f9309 100644
--- a/tests/compiler/builtins.ts
+++ b/tests/compiler/builtins.ts
@@ -676,25 +676,3 @@ function rotr3(a: i8, b: i8, c: i8): i32 {
   return rotr(a, rotr(b, c));
 }
 assert(rotr3(48, 8, 1) == 3);
-
-// bswap tests
-
-// check bswap<T> for i8/u8
-assert(bswap<u8>(<u8>0xaa) == <u8>0xaa);
-assert(bswap<i8>(<i8>0xaa) == <i8>0xaa);
-
-// check bswap<T> for i16/u16
-assert(bswap<u16>(<u16>0xaabb) == <u16>0xbbaa);
-assert(bswap<i16>(<i16>0xaabb) == <i16>0xbbaa);
-
-// check bswap<T> for i32/u32
-assert(bswap<u32>(<u32>0xaabbccdd) == <u32>0xddccbbaa);
-assert(bswap<i32>(<i32>0xaabbccdd) == <i32>0xddccbbaa);
-
-// check bswap<T> for i64/u64
-assert(bswap<u64>(<u64>0x00112233aabbccdd) == <u64>0xddccbbaa33221100);
-assert(bswap<i64>(<i64>0x00112233aabbccdd) == <i64>0xddccbbaa33221100);
-
-// check bswap<T> for isize/usize
-assert(bswap<usize>(<usize>0xaabbccdd) == <usize>0xddccbbaa);
-assert(bswap<isize>(<isize>0xaabbccdd) == <isize>0xddccbbaa);
diff --git a/tests/compiler/polyfills.debug.wat b/tests/compiler/polyfills.debug.wat
new file mode 100644
index 0000000000..5a5100659a
--- /dev/null
+++ b/tests/compiler/polyfills.debug.wat
@@ -0,0 +1,511 @@
+(module
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i64_=>_i64 (func (param i64) (result i64)))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
+ (global $~lib/memory/__data_end i32 (i32.const 60))
+ (global $~lib/memory/__stack_pointer (mut i32) (i32.const 32828))
+ (global $~lib/memory/__heap_base i32 (i32.const 32828))
+ (memory $0 1)
+ (data $0 (i32.const 12) ",\00\00\00\00\00\00\00\00\00\00\00\02\00\00\00\18\00\00\00p\00o\00l\00y\00f\00i\00l\00l\00s\00.\00t\00s\00\00\00\00\00")
+ (table $0 1 1 funcref)
+ (elem $0 (i32.const 1))
+ (export "memory" (memory $0))
+ (start $~start)
+ (func $~lib/polyfills/bswap<u8> (param $value i32) (result i32)
+  i32.const 1
+  drop
+  i32.const 1
+  i32.const 1
+  i32.eq
+  drop
+  local.get $value
+  return
+ )
+ (func $~lib/polyfills/bswap<i8> (param $value i32) (result i32)
+  i32.const 1
+  drop
+  i32.const 1
+  i32.const 1
+  i32.eq
+  drop
+  local.get $value
+  return
+ )
+ (func $~lib/polyfills/bswap<u16> (param $value i32) (result i32)
+  i32.const 1
+  drop
+  i32.const 2
+  i32.const 1
+  i32.eq
+  drop
+  i32.const 2
+  i32.const 2
+  i32.eq
+  drop
+  local.get $value
+  i32.const 8
+  i32.const 15
+  i32.and
+  i32.shl
+  local.get $value
+  i32.const 65535
+  i32.and
+  i32.const 8
+  i32.const 15
+  i32.and
+  i32.shr_u
+  i32.or
+  return
+ )
+ (func $~lib/polyfills/bswap<i16> (param $value i32) (result i32)
+  i32.const 1
+  drop
+  i32.const 2
+  i32.const 1
+  i32.eq
+  drop
+  i32.const 2
+  i32.const 2
+  i32.eq
+  drop
+  local.get $value
+  i32.const 8
+  i32.const 15
+  i32.and
+  i32.shl
+  local.get $value
+  i32.const 65535
+  i32.and
+  i32.const 8
+  i32.const 15
+  i32.and
+  i32.shr_u
+  i32.or
+  return
+ )
+ (func $~lib/polyfills/bswap<u32> (param $value i32) (result i32)
+  i32.const 1
+  drop
+  i32.const 4
+  i32.const 1
+  i32.eq
+  drop
+  i32.const 4
+  i32.const 2
+  i32.eq
+  drop
+  i32.const 4
+  i32.const 4
+  i32.eq
+  drop
+  local.get $value
+  i32.const -16711936
+  i32.and
+  i32.const 8
+  i32.rotl
+  local.get $value
+  i32.const 16711935
+  i32.and
+  i32.const 8
+  i32.rotr
+  i32.or
+  return
+ )
+ (func $~lib/polyfills/bswap<i32> (param $value i32) (result i32)
+  i32.const 1
+  drop
+  i32.const 4
+  i32.const 1
+  i32.eq
+  drop
+  i32.const 4
+  i32.const 2
+  i32.eq
+  drop
+  i32.const 4
+  i32.const 4
+  i32.eq
+  drop
+  local.get $value
+  i32.const -16711936
+  i32.and
+  i32.const 8
+  i32.rotl
+  local.get $value
+  i32.const 16711935
+  i32.and
+  i32.const 8
+  i32.rotr
+  i32.or
+  return
+ )
+ (func $~lib/polyfills/bswap<u64> (param $value i64) (result i64)
+  (local $a i64)
+  (local $b i64)
+  (local $v i64)
+  i32.const 1
+  drop
+  i32.const 8
+  i32.const 1
+  i32.eq
+  drop
+  i32.const 8
+  i32.const 2
+  i32.eq
+  drop
+  i32.const 8
+  i32.const 4
+  i32.eq
+  drop
+  i32.const 8
+  i32.const 8
+  i32.eq
+  drop
+  local.get $value
+  i64.const 8
+  i64.shr_u
+  i64.const 71777214294589695
+  i64.and
+  local.set $a
+  local.get $value
+  i64.const 71777214294589695
+  i64.and
+  i64.const 8
+  i64.shl
+  local.set $b
+  local.get $a
+  local.get $b
+  i64.or
+  local.set $v
+  local.get $v
+  i64.const 16
+  i64.shr_u
+  i64.const 281470681808895
+  i64.and
+  local.set $a
+  local.get $v
+  i64.const 281470681808895
+  i64.and
+  i64.const 16
+  i64.shl
+  local.set $b
+  local.get $a
+  local.get $b
+  i64.or
+  i64.const 32
+  i64.rotr
+  return
+ )
+ (func $~lib/polyfills/bswap<i64> (param $value i64) (result i64)
+  (local $a i64)
+  (local $b i64)
+  (local $v i64)
+  i32.const 1
+  drop
+  i32.const 8
+  i32.const 1
+  i32.eq
+  drop
+  i32.const 8
+  i32.const 2
+  i32.eq
+  drop
+  i32.const 8
+  i32.const 4
+  i32.eq
+  drop
+  i32.const 8
+  i32.const 8
+  i32.eq
+  drop
+  local.get $value
+  i64.const 8
+  i64.shr_u
+  i64.const 71777214294589695
+  i64.and
+  local.set $a
+  local.get $value
+  i64.const 71777214294589695
+  i64.and
+  i64.const 8
+  i64.shl
+  local.set $b
+  local.get $a
+  local.get $b
+  i64.or
+  local.set $v
+  local.get $v
+  i64.const 16
+  i64.shr_u
+  i64.const 281470681808895
+  i64.and
+  local.set $a
+  local.get $v
+  i64.const 281470681808895
+  i64.and
+  i64.const 16
+  i64.shl
+  local.set $b
+  local.get $a
+  local.get $b
+  i64.or
+  i64.const 32
+  i64.rotr
+  return
+ )
+ (func $~lib/polyfills/bswap<usize> (param $value i32) (result i32)
+  i32.const 1
+  drop
+  i32.const 4
+  i32.const 1
+  i32.eq
+  drop
+  i32.const 4
+  i32.const 2
+  i32.eq
+  drop
+  i32.const 4
+  i32.const 4
+  i32.eq
+  drop
+  local.get $value
+  i32.const -16711936
+  i32.and
+  i32.const 8
+  i32.rotl
+  local.get $value
+  i32.const 16711935
+  i32.and
+  i32.const 8
+  i32.rotr
+  i32.or
+  return
+ )
+ (func $~lib/polyfills/bswap<isize> (param $value i32) (result i32)
+  i32.const 1
+  drop
+  i32.const 4
+  i32.const 1
+  i32.eq
+  drop
+  i32.const 4
+  i32.const 2
+  i32.eq
+  drop
+  i32.const 4
+  i32.const 4
+  i32.eq
+  drop
+  local.get $value
+  i32.const -16711936
+  i32.and
+  i32.const 8
+  i32.rotl
+  local.get $value
+  i32.const 16711935
+  i32.and
+  i32.const 8
+  i32.rotr
+  i32.or
+  return
+ )
+ (func $start:polyfills
+  i32.const 170
+  call $~lib/polyfills/bswap<u8>
+  i32.const 255
+  i32.and
+  i32.const 170
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 32
+   i32.const 2
+   i32.const 1
+   call $~lib/builtins/abort
+   unreachable
+  end
+  i32.const 170
+  call $~lib/polyfills/bswap<i8>
+  i32.extend8_s
+  i32.const 170
+  i32.extend8_s
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 32
+   i32.const 3
+   i32.const 1
+   call $~lib/builtins/abort
+   unreachable
+  end
+  i32.const 43707
+  call $~lib/polyfills/bswap<u16>
+  i32.const 65535
+  i32.and
+  i32.const 48042
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 32
+   i32.const 6
+   i32.const 1
+   call $~lib/builtins/abort
+   unreachable
+  end
+  i32.const 43707
+  call $~lib/polyfills/bswap<i16>
+  i32.extend16_s
+  i32.const 48042
+  i32.extend16_s
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 32
+   i32.const 7
+   i32.const 1
+   call $~lib/builtins/abort
+   unreachable
+  end
+  i32.const 43707
+  call $~lib/polyfills/bswap<i16>
+  i32.extend16_s
+  i32.const 48042
+  i32.extend16_s
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 32
+   i32.const 8
+   i32.const 1
+   call $~lib/builtins/abort
+   unreachable
+  end
+  i32.const -1430532899
+  call $~lib/polyfills/bswap<u32>
+  i32.const -573785174
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 32
+   i32.const 11
+   i32.const 1
+   call $~lib/builtins/abort
+   unreachable
+  end
+  i32.const -1430532899
+  call $~lib/polyfills/bswap<i32>
+  i32.const -573785174
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 32
+   i32.const 12
+   i32.const 1
+   call $~lib/builtins/abort
+   unreachable
+  end
+  i32.const -1430532899
+  call $~lib/polyfills/bswap<i32>
+  i32.const -573785174
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 32
+   i32.const 13
+   i32.const 1
+   call $~lib/builtins/abort
+   unreachable
+  end
+  i64.const 4822679907192029
+  call $~lib/polyfills/bswap<u64>
+  i64.const -2464388556401798912
+  i64.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 32
+   i32.const 16
+   i32.const 1
+   call $~lib/builtins/abort
+   unreachable
+  end
+  i64.const 4822679907192029
+  call $~lib/polyfills/bswap<i64>
+  i64.const -2464388556401798912
+  i64.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 32
+   i32.const 17
+   i32.const 1
+   call $~lib/builtins/abort
+   unreachable
+  end
+  i64.const 4822679907192029
+  call $~lib/polyfills/bswap<i64>
+  i64.const -2464388556401798912
+  i64.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 32
+   i32.const 18
+   i32.const 1
+   call $~lib/builtins/abort
+   unreachable
+  end
+  i32.const -1430532899
+  call $~lib/polyfills/bswap<usize>
+  i32.const -573785174
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 32
+   i32.const 21
+   i32.const 1
+   call $~lib/builtins/abort
+   unreachable
+  end
+  i32.const -1430532899
+  call $~lib/polyfills/bswap<isize>
+  i32.const -573785174
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 32
+   i32.const 22
+   i32.const 1
+   call $~lib/builtins/abort
+   unreachable
+  end
+  i32.const -1430532899
+  call $~lib/polyfills/bswap<isize>
+  i32.const -573785174
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 32
+   i32.const 23
+   i32.const 1
+   call $~lib/builtins/abort
+   unreachable
+  end
+ )
+ (func $~start
+  call $start:polyfills
+ )
+)
diff --git a/tests/compiler/polyfills.json b/tests/compiler/polyfills.json
new file mode 100644
index 0000000000..1bdd02b1be
--- /dev/null
+++ b/tests/compiler/polyfills.json
@@ -0,0 +1,4 @@
+{
+  "asc_flags": [
+  ]
+}
diff --git a/tests/compiler/polyfills.release.wat b/tests/compiler/polyfills.release.wat
new file mode 100644
index 0000000000..b46680aba3
--- /dev/null
+++ b/tests/compiler/polyfills.release.wat
@@ -0,0 +1,6 @@
+(module
+ (memory $0 1)
+ (data $0 (i32.const 1036) ",")
+ (data $0.1 (i32.const 1048) "\02\00\00\00\18\00\00\00p\00o\00l\00y\00f\00i\00l\00l\00s\00.\00t\00s")
+ (export "memory" (memory $0))
+)
diff --git a/tests/compiler/polyfills.ts b/tests/compiler/polyfills.ts
new file mode 100644
index 0000000000..02a6419106
--- /dev/null
+++ b/tests/compiler/polyfills.ts
@@ -0,0 +1,23 @@
+// check bswap<T> for i8/u8
+assert(bswap<u8>(<u8>0xaa) == <u8>0xaa);
+assert(bswap<i8>(<i8>0xaa) == <i8>0xaa);
+
+// check bswap<T> for i16/u16
+assert(bswap<u16>(<u16>0xaabb) == <u16>0xbbaa);
+assert(bswap<i16>(<i16>0xaabb) == <i16>0xbbaa);
+assert(bswap(<i16>0xaabb) == <i16>0xbbaa);
+
+// check bswap<T> for i32/u32
+assert(bswap<u32>(<u32>0xaabbccdd) == <u32>0xddccbbaa);
+assert(bswap<i32>(<i32>0xaabbccdd) == <i32>0xddccbbaa);
+assert(bswap(<i32>0xaabbccdd) == <i32>0xddccbbaa);
+
+// check bswap<T> for i64/u64
+assert(bswap<u64>(<u64>0x00112233aabbccdd) == <u64>0xddccbbaa33221100);
+assert(bswap<i64>(<i64>0x00112233aabbccdd) == <i64>0xddccbbaa33221100);
+assert(bswap(<i64>0x00112233aabbccdd) == <i64>0xddccbbaa33221100);
+
+// check bswap<T> for isize/usize
+assert(bswap<usize>(<usize>0xaabbccdd) == <usize>0xddccbbaa);
+assert(bswap<isize>(<isize>0xaabbccdd) == <isize>0xddccbbaa);
+assert(bswap(<isize>0xaabbccdd) == <isize>0xddccbbaa);
diff --git a/tests/compiler/std/array.debug.wat b/tests/compiler/std/array.debug.wat
index f90bea8d07..07ca4f9cd1 100644
--- a/tests/compiler/std/array.debug.wat
+++ b/tests/compiler/std/array.debug.wat
@@ -14,6 +14,7 @@
  (type $i64_i32_=>_i32 (func (param i64 i32) (result i32)))
  (type $none_=>_f64 (func (result f64)))
  (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i64_=>_i64 (func (param i64) (result i64)))
  (type $i32_i64_i32_=>_none (func (param i32 i64 i32)))
  (type $i32_i32_i32_=>_f32 (func (param i32 i32 i32) (result f32)))
  (type $i32_i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32 i32) (result i32)))
@@ -26,7 +27,6 @@
  (type $none_=>_i32 (func (result i32)))
  (type $i32_i32_f32_i32_i32_=>_none (func (param i32 i32 f32 i32 i32)))
  (type $i32_i64_i32_i32_=>_none (func (param i32 i64 i32 i32)))
- (type $i64_=>_i64 (func (param i64) (result i64)))
  (type $i64_=>_none (func (param i64)))
  (type $i32_i64_i32_i64_i32_i64_i32_=>_i32 (func (param i32 i64 i32 i64 i32 i64 i32) (result i32)))
  (type $i64_=>_i32 (func (param i64) (result i32)))
@@ -3282,20 +3282,73 @@
    end
   end
  )
+ (func $~lib/polyfills/bswap<u64> (param $value i64) (result i64)
+  (local $a i64)
+  (local $b i64)
+  (local $v i64)
+  i32.const 1
+  drop
+  i32.const 8
+  i32.const 1
+  i32.eq
+  drop
+  i32.const 8
+  i32.const 2
+  i32.eq
+  drop
+  i32.const 8
+  i32.const 4
+  i32.eq
+  drop
+  i32.const 8
+  i32.const 8
+  i32.eq
+  drop
+  local.get $value
+  i64.const 8
+  i64.shr_u
+  i64.const 71777214294589695
+  i64.and
+  local.set $a
+  local.get $value
+  i64.const 71777214294589695
+  i64.and
+  i64.const 8
+  i64.shl
+  local.set $b
+  local.get $a
+  local.get $b
+  i64.or
+  local.set $v
+  local.get $v
+  i64.const 16
+  i64.shr_u
+  i64.const 281470681808895
+  i64.and
+  local.set $a
+  local.get $v
+  i64.const 281470681808895
+  i64.and
+  i64.const 16
+  i64.shl
+  local.set $b
+  local.get $a
+  local.get $b
+  i64.or
+  i64.const 32
+  i64.rotr
+  return
+ )
  (func $~lib/util/bytes/REVERSE<u8> (param $ptr i32) (param $len i32)
   (local $i i32)
   (local $tail i32)
   (local $hlen i32)
   (local $front i32)
   (local $back i32)
-  (local $7 i64)
-  (local $8 i64)
   (local $temp i64)
-  (local $10 i64)
-  (local $11 i64)
-  (local $front|12 i32)
-  (local $back|13 i32)
-  (local $temp|14 i32)
+  (local $front|8 i32)
+  (local $back|9 i32)
+  (local $temp|10 i32)
   local.get $len
   i32.const 1
   i32.gt_u
@@ -3337,58 +3390,12 @@
      local.set $back
      local.get $front
      i64.load $0
-     local.tee $7
-     i64.const 8
-     i64.shr_u
-     i64.const 71777214294589695
-     i64.and
-     local.get $7
-     i64.const 71777214294589695
-     i64.and
-     i64.const 8
-     i64.shl
-     i64.or
-     local.tee $8
-     i64.const 16
-     i64.shr_u
-     i64.const 281470681808895
-     i64.and
-     local.get $8
-     i64.const 281470681808895
-     i64.and
-     i64.const 16
-     i64.shl
-     i64.or
-     i64.const 32
-     i64.rotr
+     call $~lib/polyfills/bswap<u64>
      local.set $temp
      local.get $front
      local.get $back
      i64.load $0
-     local.tee $10
-     i64.const 8
-     i64.shr_u
-     i64.const 71777214294589695
-     i64.and
-     local.get $10
-     i64.const 71777214294589695
-     i64.and
-     i64.const 8
-     i64.shl
-     i64.or
-     local.tee $11
-     i64.const 16
-     i64.shr_u
-     i64.const 281470681808895
-     i64.and
-     local.get $11
-     i64.const 281470681808895
-     i64.and
-     i64.const 16
-     i64.shl
-     i64.or
-     i64.const 32
-     i64.rotr
+     call $~lib/polyfills/bswap<u64>
      i64.store $0
      local.get $back
      local.get $temp
@@ -3418,7 +3425,7 @@
      i32.const 0
      i32.shl
      i32.add
-     local.set $front|12
+     local.set $front|8
      local.get $ptr
      local.get $tail
      local.get $i
@@ -3426,16 +3433,16 @@
      i32.const 0
      i32.shl
      i32.add
-     local.set $back|13
-     local.get $front|12
+     local.set $back|9
+     local.get $front|8
      i32.load8_u $0
-     local.set $temp|14
-     local.get $front|12
-     local.get $back|13
+     local.set $temp|10
+     local.get $front|8
+     local.get $back|9
      i32.load8_u $0
      i32.store8 $0
-     local.get $back|13
-     local.get $temp|14
+     local.get $back|9
+     local.get $temp|10
      i32.store8 $0
      local.get $i
      i32.const 1
diff --git a/tests/compiler/std/dataview.debug.wat b/tests/compiler/std/dataview.debug.wat
index a8aac60b96..129a593460 100644
--- a/tests/compiler/std/dataview.debug.wat
+++ b/tests/compiler/std/dataview.debug.wat
@@ -12,6 +12,7 @@
  (type $i32_i32_i64_i32_=>_none (func (param i32 i32 i64 i32)))
  (type $i32_i32_i64_=>_i32 (func (param i32 i32 i64) (result i32)))
  (type $none_=>_i32 (func (result i32)))
+ (type $i64_=>_i64 (func (param i64) (result i64)))
  (type $i32_i32_i32_=>_f32 (func (param i32 i32 i32) (result f32)))
  (type $i32_i32_i32_=>_f64 (func (param i32 i32 i32) (result f64)))
  (type $i32_i32_f32_i32_=>_none (func (param i32 i32 f32 i32)))
@@ -2394,6 +2395,117 @@
   local.get $this
   i32.load $0 offset=4
  )
+ (func $~lib/polyfills/bswap<u32> (param $value i32) (result i32)
+  i32.const 1
+  drop
+  i32.const 4
+  i32.const 1
+  i32.eq
+  drop
+  i32.const 4
+  i32.const 2
+  i32.eq
+  drop
+  i32.const 4
+  i32.const 4
+  i32.eq
+  drop
+  local.get $value
+  i32.const -16711936
+  i32.and
+  i32.const 8
+  i32.rotl
+  local.get $value
+  i32.const 16711935
+  i32.and
+  i32.const 8
+  i32.rotr
+  i32.or
+  return
+ )
+ (func $~lib/polyfills/bswap<u64> (param $value i64) (result i64)
+  (local $a i64)
+  (local $b i64)
+  (local $v i64)
+  i32.const 1
+  drop
+  i32.const 8
+  i32.const 1
+  i32.eq
+  drop
+  i32.const 8
+  i32.const 2
+  i32.eq
+  drop
+  i32.const 8
+  i32.const 4
+  i32.eq
+  drop
+  i32.const 8
+  i32.const 8
+  i32.eq
+  drop
+  local.get $value
+  i64.const 8
+  i64.shr_u
+  i64.const 71777214294589695
+  i64.and
+  local.set $a
+  local.get $value
+  i64.const 71777214294589695
+  i64.and
+  i64.const 8
+  i64.shl
+  local.set $b
+  local.get $a
+  local.get $b
+  i64.or
+  local.set $v
+  local.get $v
+  i64.const 16
+  i64.shr_u
+  i64.const 281470681808895
+  i64.and
+  local.set $a
+  local.get $v
+  i64.const 281470681808895
+  i64.and
+  i64.const 16
+  i64.shl
+  local.set $b
+  local.get $a
+  local.get $b
+  i64.or
+  i64.const 32
+  i64.rotr
+  return
+ )
+ (func $~lib/polyfills/bswap<u16> (param $value i32) (result i32)
+  i32.const 1
+  drop
+  i32.const 2
+  i32.const 1
+  i32.eq
+  drop
+  i32.const 2
+  i32.const 2
+  i32.eq
+  drop
+  local.get $value
+  i32.const 8
+  i32.const 15
+  i32.and
+  i32.shl
+  local.get $value
+  i32.const 65535
+  i32.and
+  i32.const 8
+  i32.const 15
+  i32.and
+  i32.shr_u
+  i32.or
+  return
+ )
  (func $~lib/dataview/DataView#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
@@ -2886,8 +2998,7 @@
  )
  (func $~lib/dataview/DataView#getFloat32 (param $this i32) (param $byteOffset i32) (param $littleEndian i32) (result f32)
   (local $3 i32)
-  (local $4 i32)
-  (local $5 f32)
+  (local $4 f32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -2903,11 +3014,11 @@
   i32.const 4
   i32.add
   local.get $this
-  local.set $4
+  local.set $3
   global.get $~lib/memory/__stack_pointer
-  local.get $4
+  local.get $3
   i32.store $0
-  local.get $4
+  local.get $3
   call $~lib/dataview/DataView#get:byteLength
   i32.gt_s
   i32.or
@@ -2922,52 +3033,40 @@
   local.get $littleEndian
   if (result f32)
    local.get $this
-   local.set $4
+   local.set $3
    global.get $~lib/memory/__stack_pointer
-   local.get $4
+   local.get $3
    i32.store $0
-   local.get $4
+   local.get $3
    call $~lib/dataview/DataView#get:dataStart
    local.get $byteOffset
    i32.add
    f32.load $0
   else
    local.get $this
-   local.set $4
+   local.set $3
    global.get $~lib/memory/__stack_pointer
-   local.get $4
+   local.get $3
    i32.store $0
-   local.get $4
+   local.get $3
    call $~lib/dataview/DataView#get:dataStart
    local.get $byteOffset
    i32.add
    i32.load $0
-   local.tee $3
-   i32.const -16711936
-   i32.and
-   i32.const 8
-   i32.rotl
-   local.get $3
-   i32.const 16711935
-   i32.and
-   i32.const 8
-   i32.rotr
-   i32.or
+   call $~lib/polyfills/bswap<u32>
    f32.reinterpret_i32
   end
-  local.set $5
+  local.set $4
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.add
   global.set $~lib/memory/__stack_pointer
-  local.get $5
+  local.get $4
   return
  )
  (func $~lib/dataview/DataView#getFloat64 (param $this i32) (param $byteOffset i32) (param $littleEndian i32) (result f64)
-  (local $3 i64)
-  (local $4 i64)
-  (local $5 i32)
-  (local $6 f64)
+  (local $3 i32)
+  (local $4 f64)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -2983,11 +3082,11 @@
   i32.const 8
   i32.add
   local.get $this
-  local.set $5
+  local.set $3
   global.get $~lib/memory/__stack_pointer
-  local.get $5
+  local.get $3
   i32.store $0
-  local.get $5
+  local.get $3
   call $~lib/dataview/DataView#get:byteLength
   i32.gt_s
   i32.or
@@ -3002,58 +3101,35 @@
   local.get $littleEndian
   if (result f64)
    local.get $this
-   local.set $5
+   local.set $3
    global.get $~lib/memory/__stack_pointer
-   local.get $5
+   local.get $3
    i32.store $0
-   local.get $5
+   local.get $3
    call $~lib/dataview/DataView#get:dataStart
    local.get $byteOffset
    i32.add
    f64.load $0
   else
    local.get $this
-   local.set $5
+   local.set $3
    global.get $~lib/memory/__stack_pointer
-   local.get $5
+   local.get $3
    i32.store $0
-   local.get $5
+   local.get $3
    call $~lib/dataview/DataView#get:dataStart
    local.get $byteOffset
    i32.add
    i64.load $0
-   local.tee $3
-   i64.const 8
-   i64.shr_u
-   i64.const 71777214294589695
-   i64.and
-   local.get $3
-   i64.const 71777214294589695
-   i64.and
-   i64.const 8
-   i64.shl
-   i64.or
-   local.tee $4
-   i64.const 16
-   i64.shr_u
-   i64.const 281470681808895
-   i64.and
-   local.get $4
-   i64.const 281470681808895
-   i64.and
-   i64.const 16
-   i64.shl
-   i64.or
-   i64.const 32
-   i64.rotr
+   call $~lib/polyfills/bswap<u64>
    f64.reinterpret_i64
   end
-  local.set $6
+  local.set $4
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.add
   global.set $~lib/memory/__stack_pointer
-  local.get $6
+  local.get $4
   return
  )
  (func $~lib/dataview/DataView#getInt8 (param $this i32) (param $byteOffset i32) (result i32)
@@ -3104,7 +3180,6 @@
  (func $~lib/dataview/DataView#getInt16 (param $this i32) (param $byteOffset i32) (param $littleEndian i32) (result i32)
   (local $result i32)
   (local $4 i32)
-  (local $5 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -3120,11 +3195,11 @@
   i32.const 2
   i32.add
   local.get $this
-  local.set $5
+  local.set $4
   global.get $~lib/memory/__stack_pointer
-  local.get $5
+  local.get $4
   i32.store $0
-  local.get $5
+  local.get $4
   call $~lib/dataview/DataView#get:byteLength
   i32.gt_s
   i32.or
@@ -3137,11 +3212,11 @@
    unreachable
   end
   local.get $this
-  local.set $5
+  local.set $4
   global.get $~lib/memory/__stack_pointer
-  local.get $5
+  local.get $4
   i32.store $0
-  local.get $5
+  local.get $4
   call $~lib/dataview/DataView#get:dataStart
   local.get $byteOffset
   i32.add
@@ -3152,28 +3227,19 @@
    local.get $result
   else
    local.get $result
-   i32.const 65535
-   i32.and
-   local.tee $4
-   i32.const 8
-   i32.shl
-   local.get $4
-   i32.const 8
-   i32.shr_u
-   i32.or
+   call $~lib/polyfills/bswap<u16>
   end
-  local.set $5
+  local.set $4
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.add
   global.set $~lib/memory/__stack_pointer
-  local.get $5
+  local.get $4
   return
  )
  (func $~lib/dataview/DataView#getInt32 (param $this i32) (param $byteOffset i32) (param $littleEndian i32) (result i32)
   (local $result i32)
   (local $4 i32)
-  (local $5 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -3189,11 +3255,11 @@
   i32.const 4
   i32.add
   local.get $this
-  local.set $5
+  local.set $4
   global.get $~lib/memory/__stack_pointer
-  local.get $5
+  local.get $4
   i32.store $0
-  local.get $5
+  local.get $4
   call $~lib/dataview/DataView#get:byteLength
   i32.gt_s
   i32.or
@@ -3206,11 +3272,11 @@
    unreachable
   end
   local.get $this
-  local.set $5
+  local.set $4
   global.get $~lib/memory/__stack_pointer
-  local.get $5
+  local.get $4
   i32.store $0
-  local.get $5
+  local.get $4
   call $~lib/dataview/DataView#get:dataStart
   local.get $byteOffset
   i32.add
@@ -3221,32 +3287,20 @@
    local.get $result
   else
    local.get $result
-   local.tee $4
-   i32.const -16711936
-   i32.and
-   i32.const 8
-   i32.rotl
-   local.get $4
-   i32.const 16711935
-   i32.and
-   i32.const 8
-   i32.rotr
-   i32.or
+   call $~lib/polyfills/bswap<u32>
   end
-  local.set $5
+  local.set $4
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.add
   global.set $~lib/memory/__stack_pointer
-  local.get $5
+  local.get $4
   return
  )
  (func $~lib/dataview/DataView#getInt64 (param $this i32) (param $byteOffset i32) (param $littleEndian i32) (result i64)
   (local $result i64)
-  (local $4 i64)
+  (local $4 i32)
   (local $5 i64)
-  (local $6 i32)
-  (local $7 i64)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -3262,11 +3316,11 @@
   i32.const 8
   i32.add
   local.get $this
-  local.set $6
+  local.set $4
   global.get $~lib/memory/__stack_pointer
-  local.get $6
+  local.get $4
   i32.store $0
-  local.get $6
+  local.get $4
   call $~lib/dataview/DataView#get:byteLength
   i32.gt_s
   i32.or
@@ -3279,11 +3333,11 @@
    unreachable
   end
   local.get $this
-  local.set $6
+  local.set $4
   global.get $~lib/memory/__stack_pointer
-  local.get $6
+  local.get $4
   i32.store $0
-  local.get $6
+  local.get $4
   call $~lib/dataview/DataView#get:dataStart
   local.get $byteOffset
   i32.add
@@ -3294,37 +3348,14 @@
    local.get $result
   else
    local.get $result
-   local.tee $4
-   i64.const 8
-   i64.shr_u
-   i64.const 71777214294589695
-   i64.and
-   local.get $4
-   i64.const 71777214294589695
-   i64.and
-   i64.const 8
-   i64.shl
-   i64.or
-   local.tee $5
-   i64.const 16
-   i64.shr_u
-   i64.const 281470681808895
-   i64.and
-   local.get $5
-   i64.const 281470681808895
-   i64.and
-   i64.const 16
-   i64.shl
-   i64.or
-   i64.const 32
-   i64.rotr
-  end
-  local.set $7
+   call $~lib/polyfills/bswap<u64>
+  end
+  local.set $5
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.add
   global.set $~lib/memory/__stack_pointer
-  local.get $7
+  local.get $5
   return
  )
  (func $~lib/dataview/DataView#getUint8 (param $this i32) (param $byteOffset i32) (result i32)
@@ -3375,7 +3406,6 @@
  (func $~lib/dataview/DataView#getUint16 (param $this i32) (param $byteOffset i32) (param $littleEndian i32) (result i32)
   (local $result i32)
   (local $4 i32)
-  (local $5 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -3391,11 +3421,11 @@
   i32.const 2
   i32.add
   local.get $this
-  local.set $5
+  local.set $4
   global.get $~lib/memory/__stack_pointer
-  local.get $5
+  local.get $4
   i32.store $0
-  local.get $5
+  local.get $4
   call $~lib/dataview/DataView#get:byteLength
   i32.gt_s
   i32.or
@@ -3408,11 +3438,11 @@
    unreachable
   end
   local.get $this
-  local.set $5
+  local.set $4
   global.get $~lib/memory/__stack_pointer
-  local.get $5
+  local.get $4
   i32.store $0
-  local.get $5
+  local.get $4
   call $~lib/dataview/DataView#get:dataStart
   local.get $byteOffset
   i32.add
@@ -3423,26 +3453,19 @@
    local.get $result
   else
    local.get $result
-   local.tee $4
-   i32.const 8
-   i32.shl
-   local.get $4
-   i32.const 8
-   i32.shr_u
-   i32.or
+   call $~lib/polyfills/bswap<u16>
   end
-  local.set $5
+  local.set $4
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.add
   global.set $~lib/memory/__stack_pointer
-  local.get $5
+  local.get $4
   return
  )
  (func $~lib/dataview/DataView#getUint32 (param $this i32) (param $byteOffset i32) (param $littleEndian i32) (result i32)
   (local $result i32)
   (local $4 i32)
-  (local $5 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -3458,11 +3481,11 @@
   i32.const 4
   i32.add
   local.get $this
-  local.set $5
+  local.set $4
   global.get $~lib/memory/__stack_pointer
-  local.get $5
+  local.get $4
   i32.store $0
-  local.get $5
+  local.get $4
   call $~lib/dataview/DataView#get:byteLength
   i32.gt_s
   i32.or
@@ -3475,11 +3498,11 @@
    unreachable
   end
   local.get $this
-  local.set $5
+  local.set $4
   global.get $~lib/memory/__stack_pointer
-  local.get $5
+  local.get $4
   i32.store $0
-  local.get $5
+  local.get $4
   call $~lib/dataview/DataView#get:dataStart
   local.get $byteOffset
   i32.add
@@ -3490,32 +3513,20 @@
    local.get $result
   else
    local.get $result
-   local.tee $4
-   i32.const -16711936
-   i32.and
-   i32.const 8
-   i32.rotl
-   local.get $4
-   i32.const 16711935
-   i32.and
-   i32.const 8
-   i32.rotr
-   i32.or
+   call $~lib/polyfills/bswap<u32>
   end
-  local.set $5
+  local.set $4
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.add
   global.set $~lib/memory/__stack_pointer
-  local.get $5
+  local.get $4
   return
  )
  (func $~lib/dataview/DataView#getUint64 (param $this i32) (param $byteOffset i32) (param $littleEndian i32) (result i64)
   (local $result i64)
-  (local $4 i64)
+  (local $4 i32)
   (local $5 i64)
-  (local $6 i32)
-  (local $7 i64)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -3531,11 +3542,11 @@
   i32.const 8
   i32.add
   local.get $this
-  local.set $6
+  local.set $4
   global.get $~lib/memory/__stack_pointer
-  local.get $6
+  local.get $4
   i32.store $0
-  local.get $6
+  local.get $4
   call $~lib/dataview/DataView#get:byteLength
   i32.gt_s
   i32.or
@@ -3548,11 +3559,11 @@
    unreachable
   end
   local.get $this
-  local.set $6
+  local.set $4
   global.get $~lib/memory/__stack_pointer
-  local.get $6
+  local.get $4
   i32.store $0
-  local.get $6
+  local.get $4
   call $~lib/dataview/DataView#get:dataStart
   local.get $byteOffset
   i32.add
@@ -3563,42 +3574,18 @@
    local.get $result
   else
    local.get $result
-   local.tee $4
-   i64.const 8
-   i64.shr_u
-   i64.const 71777214294589695
-   i64.and
-   local.get $4
-   i64.const 71777214294589695
-   i64.and
-   i64.const 8
-   i64.shl
-   i64.or
-   local.tee $5
-   i64.const 16
-   i64.shr_u
-   i64.const 281470681808895
-   i64.and
-   local.get $5
-   i64.const 281470681808895
-   i64.and
-   i64.const 16
-   i64.shl
-   i64.or
-   i64.const 32
-   i64.rotr
-  end
-  local.set $7
+   call $~lib/polyfills/bswap<u64>
+  end
+  local.set $5
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.add
   global.set $~lib/memory/__stack_pointer
-  local.get $7
+  local.get $5
   return
  )
  (func $~lib/dataview/DataView#setFloat32 (param $this i32) (param $byteOffset i32) (param $value f32) (param $littleEndian i32)
   (local $4 i32)
-  (local $5 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -3614,11 +3601,11 @@
   i32.const 4
   i32.add
   local.get $this
-  local.set $5
+  local.set $4
   global.get $~lib/memory/__stack_pointer
-  local.get $5
+  local.get $4
   i32.store $0
-  local.get $5
+  local.get $4
   call $~lib/dataview/DataView#get:byteLength
   i32.gt_s
   i32.or
@@ -3633,11 +3620,11 @@
   local.get $littleEndian
   if
    local.get $this
-   local.set $5
+   local.set $4
    global.get $~lib/memory/__stack_pointer
-   local.get $5
+   local.get $4
    i32.store $0
-   local.get $5
+   local.get $4
    call $~lib/dataview/DataView#get:dataStart
    local.get $byteOffset
    i32.add
@@ -3645,27 +3632,17 @@
    f32.store $0
   else
    local.get $this
-   local.set $5
+   local.set $4
    global.get $~lib/memory/__stack_pointer
-   local.get $5
+   local.get $4
    i32.store $0
-   local.get $5
+   local.get $4
    call $~lib/dataview/DataView#get:dataStart
    local.get $byteOffset
    i32.add
    local.get $value
    i32.reinterpret_f32
-   local.tee $4
-   i32.const -16711936
-   i32.and
-   i32.const 8
-   i32.rotl
-   local.get $4
-   i32.const 16711935
-   i32.and
-   i32.const 8
-   i32.rotr
-   i32.or
+   call $~lib/polyfills/bswap<u32>
    i32.store $0
   end
   global.get $~lib/memory/__stack_pointer
@@ -3674,9 +3651,7 @@
   global.set $~lib/memory/__stack_pointer
  )
  (func $~lib/dataview/DataView#setFloat64 (param $this i32) (param $byteOffset i32) (param $value f64) (param $littleEndian i32)
-  (local $4 i64)
-  (local $5 i64)
-  (local $6 i32)
+  (local $4 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -3692,11 +3667,11 @@
   i32.const 8
   i32.add
   local.get $this
-  local.set $6
+  local.set $4
   global.get $~lib/memory/__stack_pointer
-  local.get $6
+  local.get $4
   i32.store $0
-  local.get $6
+  local.get $4
   call $~lib/dataview/DataView#get:byteLength
   i32.gt_s
   i32.or
@@ -3711,11 +3686,11 @@
   local.get $littleEndian
   if
    local.get $this
-   local.set $6
+   local.set $4
    global.get $~lib/memory/__stack_pointer
-   local.get $6
+   local.get $4
    i32.store $0
-   local.get $6
+   local.get $4
    call $~lib/dataview/DataView#get:dataStart
    local.get $byteOffset
    i32.add
@@ -3723,40 +3698,17 @@
    f64.store $0
   else
    local.get $this
-   local.set $6
+   local.set $4
    global.get $~lib/memory/__stack_pointer
-   local.get $6
+   local.get $4
    i32.store $0
-   local.get $6
+   local.get $4
    call $~lib/dataview/DataView#get:dataStart
    local.get $byteOffset
    i32.add
    local.get $value
    i64.reinterpret_f64
-   local.tee $4
-   i64.const 8
-   i64.shr_u
-   i64.const 71777214294589695
-   i64.and
-   local.get $4
-   i64.const 71777214294589695
-   i64.and
-   i64.const 8
-   i64.shl
-   i64.or
-   local.tee $5
-   i64.const 16
-   i64.shr_u
-   i64.const 281470681808895
-   i64.and
-   local.get $5
-   i64.const 281470681808895
-   i64.and
-   i64.const 16
-   i64.shl
-   i64.or
-   i64.const 32
-   i64.rotr
+   call $~lib/polyfills/bswap<u64>
    i64.store $0
   end
   global.get $~lib/memory/__stack_pointer
@@ -3809,7 +3761,6 @@
  )
  (func $~lib/dataview/DataView#setInt16 (param $this i32) (param $byteOffset i32) (param $value i32) (param $littleEndian i32)
   (local $4 i32)
-  (local $5 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -3825,11 +3776,11 @@
   i32.const 2
   i32.add
   local.get $this
-  local.set $5
+  local.set $4
   global.get $~lib/memory/__stack_pointer
-  local.get $5
+  local.get $4
   i32.store $0
-  local.get $5
+  local.get $4
   call $~lib/dataview/DataView#get:byteLength
   i32.gt_s
   i32.or
@@ -3842,11 +3793,11 @@
    unreachable
   end
   local.get $this
-  local.set $5
+  local.set $4
   global.get $~lib/memory/__stack_pointer
-  local.get $5
+  local.get $4
   i32.store $0
-  local.get $5
+  local.get $4
   call $~lib/dataview/DataView#get:dataStart
   local.get $byteOffset
   i32.add
@@ -3855,15 +3806,7 @@
    local.get $value
   else
    local.get $value
-   i32.const 65535
-   i32.and
-   local.tee $4
-   i32.const 8
-   i32.shl
-   local.get $4
-   i32.const 8
-   i32.shr_u
-   i32.or
+   call $~lib/polyfills/bswap<u16>
   end
   i32.store16 $0
   global.get $~lib/memory/__stack_pointer
@@ -3873,7 +3816,6 @@
  )
  (func $~lib/dataview/DataView#setInt32 (param $this i32) (param $byteOffset i32) (param $value i32) (param $littleEndian i32)
   (local $4 i32)
-  (local $5 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -3889,11 +3831,11 @@
   i32.const 4
   i32.add
   local.get $this
-  local.set $5
+  local.set $4
   global.get $~lib/memory/__stack_pointer
-  local.get $5
+  local.get $4
   i32.store $0
-  local.get $5
+  local.get $4
   call $~lib/dataview/DataView#get:byteLength
   i32.gt_s
   i32.or
@@ -3906,11 +3848,11 @@
    unreachable
   end
   local.get $this
-  local.set $5
+  local.set $4
   global.get $~lib/memory/__stack_pointer
-  local.get $5
+  local.get $4
   i32.store $0
-  local.get $5
+  local.get $4
   call $~lib/dataview/DataView#get:dataStart
   local.get $byteOffset
   i32.add
@@ -3919,17 +3861,7 @@
    local.get $value
   else
    local.get $value
-   local.tee $4
-   i32.const -16711936
-   i32.and
-   i32.const 8
-   i32.rotl
-   local.get $4
-   i32.const 16711935
-   i32.and
-   i32.const 8
-   i32.rotr
-   i32.or
+   call $~lib/polyfills/bswap<u32>
   end
   i32.store $0
   global.get $~lib/memory/__stack_pointer
@@ -3938,9 +3870,7 @@
   global.set $~lib/memory/__stack_pointer
  )
  (func $~lib/dataview/DataView#setInt64 (param $this i32) (param $byteOffset i32) (param $value i64) (param $littleEndian i32)
-  (local $4 i64)
-  (local $5 i64)
-  (local $6 i32)
+  (local $4 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -3956,11 +3886,11 @@
   i32.const 8
   i32.add
   local.get $this
-  local.set $6
+  local.set $4
   global.get $~lib/memory/__stack_pointer
-  local.get $6
+  local.get $4
   i32.store $0
-  local.get $6
+  local.get $4
   call $~lib/dataview/DataView#get:byteLength
   i32.gt_s
   i32.or
@@ -3973,11 +3903,11 @@
    unreachable
   end
   local.get $this
-  local.set $6
+  local.set $4
   global.get $~lib/memory/__stack_pointer
-  local.get $6
+  local.get $4
   i32.store $0
-  local.get $6
+  local.get $4
   call $~lib/dataview/DataView#get:dataStart
   local.get $byteOffset
   i32.add
@@ -3986,30 +3916,7 @@
    local.get $value
   else
    local.get $value
-   local.tee $4
-   i64.const 8
-   i64.shr_u
-   i64.const 71777214294589695
-   i64.and
-   local.get $4
-   i64.const 71777214294589695
-   i64.and
-   i64.const 8
-   i64.shl
-   i64.or
-   local.tee $5
-   i64.const 16
-   i64.shr_u
-   i64.const 281470681808895
-   i64.and
-   local.get $5
-   i64.const 281470681808895
-   i64.and
-   i64.const 16
-   i64.shl
-   i64.or
-   i64.const 32
-   i64.rotr
+   call $~lib/polyfills/bswap<u64>
   end
   i64.store $0
   global.get $~lib/memory/__stack_pointer
@@ -4062,7 +3969,6 @@
  )
  (func $~lib/dataview/DataView#setUint16 (param $this i32) (param $byteOffset i32) (param $value i32) (param $littleEndian i32)
   (local $4 i32)
-  (local $5 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -4078,11 +3984,11 @@
   i32.const 2
   i32.add
   local.get $this
-  local.set $5
+  local.set $4
   global.get $~lib/memory/__stack_pointer
-  local.get $5
+  local.get $4
   i32.store $0
-  local.get $5
+  local.get $4
   call $~lib/dataview/DataView#get:byteLength
   i32.gt_s
   i32.or
@@ -4095,11 +4001,11 @@
    unreachable
   end
   local.get $this
-  local.set $5
+  local.set $4
   global.get $~lib/memory/__stack_pointer
-  local.get $5
+  local.get $4
   i32.store $0
-  local.get $5
+  local.get $4
   call $~lib/dataview/DataView#get:dataStart
   local.get $byteOffset
   i32.add
@@ -4108,15 +4014,7 @@
    local.get $value
   else
    local.get $value
-   i32.const 65535
-   i32.and
-   local.tee $4
-   i32.const 8
-   i32.shl
-   local.get $4
-   i32.const 8
-   i32.shr_u
-   i32.or
+   call $~lib/polyfills/bswap<u16>
   end
   i32.store16 $0
   global.get $~lib/memory/__stack_pointer
@@ -4126,7 +4024,6 @@
  )
  (func $~lib/dataview/DataView#setUint32 (param $this i32) (param $byteOffset i32) (param $value i32) (param $littleEndian i32)
   (local $4 i32)
-  (local $5 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -4142,11 +4039,11 @@
   i32.const 4
   i32.add
   local.get $this
-  local.set $5
+  local.set $4
   global.get $~lib/memory/__stack_pointer
-  local.get $5
+  local.get $4
   i32.store $0
-  local.get $5
+  local.get $4
   call $~lib/dataview/DataView#get:byteLength
   i32.gt_s
   i32.or
@@ -4159,11 +4056,11 @@
    unreachable
   end
   local.get $this
-  local.set $5
+  local.set $4
   global.get $~lib/memory/__stack_pointer
-  local.get $5
+  local.get $4
   i32.store $0
-  local.get $5
+  local.get $4
   call $~lib/dataview/DataView#get:dataStart
   local.get $byteOffset
   i32.add
@@ -4172,17 +4069,7 @@
    local.get $value
   else
    local.get $value
-   local.tee $4
-   i32.const -16711936
-   i32.and
-   i32.const 8
-   i32.rotl
-   local.get $4
-   i32.const 16711935
-   i32.and
-   i32.const 8
-   i32.rotr
-   i32.or
+   call $~lib/polyfills/bswap<u32>
   end
   i32.store $0
   global.get $~lib/memory/__stack_pointer
@@ -4191,9 +4078,7 @@
   global.set $~lib/memory/__stack_pointer
  )
  (func $~lib/dataview/DataView#setUint64 (param $this i32) (param $byteOffset i32) (param $value i64) (param $littleEndian i32)
-  (local $4 i64)
-  (local $5 i64)
-  (local $6 i32)
+  (local $4 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -4209,11 +4094,11 @@
   i32.const 8
   i32.add
   local.get $this
-  local.set $6
+  local.set $4
   global.get $~lib/memory/__stack_pointer
-  local.get $6
+  local.get $4
   i32.store $0
-  local.get $6
+  local.get $4
   call $~lib/dataview/DataView#get:byteLength
   i32.gt_s
   i32.or
@@ -4226,11 +4111,11 @@
    unreachable
   end
   local.get $this
-  local.set $6
+  local.set $4
   global.get $~lib/memory/__stack_pointer
-  local.get $6
+  local.get $4
   i32.store $0
-  local.get $6
+  local.get $4
   call $~lib/dataview/DataView#get:dataStart
   local.get $byteOffset
   i32.add
@@ -4239,30 +4124,7 @@
    local.get $value
   else
    local.get $value
-   local.tee $4
-   i64.const 8
-   i64.shr_u
-   i64.const 71777214294589695
-   i64.and
-   local.get $4
-   i64.const 71777214294589695
-   i64.and
-   i64.const 8
-   i64.shl
-   i64.or
-   local.tee $5
-   i64.const 16
-   i64.shr_u
-   i64.const 281470681808895
-   i64.and
-   local.get $5
-   i64.const 281470681808895
-   i64.and
-   i64.const 16
-   i64.shl
-   i64.or
-   i64.const 32
-   i64.rotr
+   call $~lib/polyfills/bswap<u64>
   end
   i64.store $0
   global.get $~lib/memory/__stack_pointer
diff --git a/tests/compiler/std/dataview.release.wat b/tests/compiler/std/dataview.release.wat
index d21469f6ec..5d6b455034 100644
--- a/tests/compiler/std/dataview.release.wat
+++ b/tests/compiler/std/dataview.release.wat
@@ -2088,21 +2088,18 @@
   i32.const 4
   i32.add
   global.set $~lib/memory/__stack_pointer
+  local.get $0
+  local.get $0
+  i32.const 8
+  i32.shl
+  local.get $0
+  i32.const 65535
+  i32.and
+  i32.const 8
+  i32.shr_u
+  i32.or
   local.get $2
-  if (result i32)
-   local.get $0
-  else
-   local.get $0
-   i32.const 65535
-   i32.and
-   local.tee $0
-   i32.const 8
-   i32.shl
-   local.get $0
-   i32.const 8
-   i32.shr_u
-   i32.or
-  end
+  select
  )
  (func $~lib/dataview/DataView#getInt32 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
@@ -2720,27 +2717,25 @@
    unreachable
   end
   global.get $~lib/memory/__stack_pointer
+  local.tee $3
   local.get $0
   i32.store $0
   local.get $0
   i32.load $0 offset=4
+  local.get $1
+  local.get $1
+  i32.const 8
+  i32.shl
+  local.get $1
+  i32.const 65535
+  i32.and
+  i32.const 8
+  i32.shr_u
+  i32.or
   local.get $2
-  if (result i32)
-   local.get $1
-  else
-   local.get $1
-   i32.const 65535
-   i32.and
-   local.tee $0
-   i32.const 8
-   i32.shl
-   local.get $0
-   i32.const 8
-   i32.shr_u
-   i32.or
-  end
+  select
   i32.store16 $0
-  global.get $~lib/memory/__stack_pointer
+  local.get $3
   i32.const 4
   i32.add
   global.set $~lib/memory/__stack_pointer
@@ -2921,27 +2916,25 @@
    unreachable
   end
   global.get $~lib/memory/__stack_pointer
+  local.tee $3
   local.get $0
   i32.store $0
   local.get $0
   i32.load $0 offset=4
+  local.get $1
+  local.get $1
+  i32.const 8
+  i32.shl
+  local.get $1
+  i32.const 65535
+  i32.and
+  i32.const 8
+  i32.shr_u
+  i32.or
   local.get $2
-  if (result i32)
-   local.get $1
-  else
-   local.get $1
-   i32.const 65535
-   i32.and
-   local.tee $0
-   i32.const 8
-   i32.shl
-   local.get $0
-   i32.const 8
-   i32.shr_u
-   i32.or
-  end
+  select
   i32.store16 $0
-  global.get $~lib/memory/__stack_pointer
+  local.get $3
   i32.const 4
   i32.add
   global.set $~lib/memory/__stack_pointer
diff --git a/tests/compiler/std/typedarray.debug.wat b/tests/compiler/std/typedarray.debug.wat
index 4196d9a65b..1f99d1139c 100644
--- a/tests/compiler/std/typedarray.debug.wat
+++ b/tests/compiler/std/typedarray.debug.wat
@@ -44,6 +44,7 @@
  (type $none_=>_i32 (func (result i32)))
  (type $f32_f32_=>_f32 (func (param f32 f32) (result f32)))
  (type $f64_f64_=>_f64 (func (param f64 f64) (result f64)))
+ (type $i64_=>_i64 (func (param i64) (result i64)))
  (type $i32_i64_i32_i32_=>_none (func (param i32 i64 i32 i32)))
  (type $i64_=>_i32 (func (param i64) (result i32)))
  (type $i32_i64_i32_i64_i32_i64_i32_=>_i32 (func (param i32 i64 i32 i64 i32 i64 i32) (result i32)))
@@ -4805,20 +4806,73 @@
   f64.const 2
   f64.eq
  )
+ (func $~lib/polyfills/bswap<u64> (param $value i64) (result i64)
+  (local $a i64)
+  (local $b i64)
+  (local $v i64)
+  i32.const 1
+  drop
+  i32.const 8
+  i32.const 1
+  i32.eq
+  drop
+  i32.const 8
+  i32.const 2
+  i32.eq
+  drop
+  i32.const 8
+  i32.const 4
+  i32.eq
+  drop
+  i32.const 8
+  i32.const 8
+  i32.eq
+  drop
+  local.get $value
+  i64.const 8
+  i64.shr_u
+  i64.const 71777214294589695
+  i64.and
+  local.set $a
+  local.get $value
+  i64.const 71777214294589695
+  i64.and
+  i64.const 8
+  i64.shl
+  local.set $b
+  local.get $a
+  local.get $b
+  i64.or
+  local.set $v
+  local.get $v
+  i64.const 16
+  i64.shr_u
+  i64.const 281470681808895
+  i64.and
+  local.set $a
+  local.get $v
+  i64.const 281470681808895
+  i64.and
+  i64.const 16
+  i64.shl
+  local.set $b
+  local.get $a
+  local.get $b
+  i64.or
+  i64.const 32
+  i64.rotr
+  return
+ )
  (func $~lib/util/bytes/REVERSE<u8> (param $ptr i32) (param $len i32)
   (local $i i32)
   (local $tail i32)
   (local $hlen i32)
   (local $front i32)
   (local $back i32)
-  (local $7 i64)
-  (local $8 i64)
   (local $temp i64)
-  (local $10 i64)
-  (local $11 i64)
-  (local $front|12 i32)
-  (local $back|13 i32)
-  (local $temp|14 i32)
+  (local $front|8 i32)
+  (local $back|9 i32)
+  (local $temp|10 i32)
   local.get $len
   i32.const 1
   i32.gt_u
@@ -4860,58 +4914,12 @@
      local.set $back
      local.get $front
      i64.load $0
-     local.tee $7
-     i64.const 8
-     i64.shr_u
-     i64.const 71777214294589695
-     i64.and
-     local.get $7
-     i64.const 71777214294589695
-     i64.and
-     i64.const 8
-     i64.shl
-     i64.or
-     local.tee $8
-     i64.const 16
-     i64.shr_u
-     i64.const 281470681808895
-     i64.and
-     local.get $8
-     i64.const 281470681808895
-     i64.and
-     i64.const 16
-     i64.shl
-     i64.or
-     i64.const 32
-     i64.rotr
+     call $~lib/polyfills/bswap<u64>
      local.set $temp
      local.get $front
      local.get $back
      i64.load $0
-     local.tee $10
-     i64.const 8
-     i64.shr_u
-     i64.const 71777214294589695
-     i64.and
-     local.get $10
-     i64.const 71777214294589695
-     i64.and
-     i64.const 8
-     i64.shl
-     i64.or
-     local.tee $11
-     i64.const 16
-     i64.shr_u
-     i64.const 281470681808895
-     i64.and
-     local.get $11
-     i64.const 281470681808895
-     i64.and
-     i64.const 16
-     i64.shl
-     i64.or
-     i64.const 32
-     i64.rotr
+     call $~lib/polyfills/bswap<u64>
      i64.store $0
      local.get $back
      local.get $temp
@@ -4941,7 +4949,7 @@
      i32.const 0
      i32.shl
      i32.add
-     local.set $front|12
+     local.set $front|8
      local.get $ptr
      local.get $tail
      local.get $i
@@ -4949,16 +4957,16 @@
      i32.const 0
      i32.shl
      i32.add
-     local.set $back|13
-     local.get $front|12
+     local.set $back|9
+     local.get $front|8
      i32.load8_u $0
-     local.set $temp|14
-     local.get $front|12
-     local.get $back|13
+     local.set $temp|10
+     local.get $front|8
+     local.get $back|9
      i32.load8_u $0
      i32.store8 $0
-     local.get $back|13
-     local.get $temp|14
+     local.get $back|9
+     local.get $temp|10
      i32.store8 $0
      local.get $i
      i32.const 1