From f92bebc5835628617daed0beb7f4227b4b3dc682 Mon Sep 17 00:00:00 2001
From: MaxGraey <maxgraey@gmail.com>
Date: Fri, 26 Aug 2022 14:04:42 +0300
Subject: [PATCH 1/2] refactor RefIsOp and RefAsOp enums

---
 src/module.ts | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/module.ts b/src/module.ts
index 7875e779c8..a8744e887e 100644
--- a/src/module.ts
+++ b/src/module.ts
@@ -1056,25 +1056,25 @@ export const enum SIMDTernaryOp {
 /** Binaryen RefIs operation constants. */
 export const enum RefIsOp {
   /** ref.is_null */
-  RefIsNull = 0 /* _BinaryenRefIsNull */,
+  Null = 0 /* _BinaryenRefIsNull */,
   /** ref.is_func */
-  RefIsFunc = 1 /* _BinaryenRefIsFunc */,
+  Func = 1 /* _BinaryenRefIsFunc */,
   /** ref.is_data */
-  RefIsData = 2 /* _BinaryenRefIsData */,
+  Data = 2 /* _BinaryenRefIsData */,
   /** ref.is_i31 */
-  RefIsI31 = 3 /* _BinaryenRefIsI31 */
+  I31 = 3 /* _BinaryenRefIsI31 */
 }
 
 /** Binaryen RefAs operation constants. */
 export const enum RefAsOp {
   /** ref.as_non_null */
-  RefAsNonNull = 0 /* _BinaryenRefAsNonNull */,
+  NonNull = 0 /* _BinaryenRefAsNonNull */,
   /** ref.as_func */
-  RefAsFunc = 1 /* _BinaryenRefAsFunc */,
+  Func = 1 /* _BinaryenRefAsFunc */,
   /** ref.as_data */
-  RefAsData = 2 /* _BinaryenRefAsData */,
+  Data = 2 /* _BinaryenRefAsData */,
   /** ref.as_i31 */
-  RefAsI31 = 3 /* _BinaryenRefAsI31 */
+  I31 = 3 /* _BinaryenRefAsI31 */
 }
 
 /** Binaryen BrOn operation constants. */
@@ -1880,7 +1880,7 @@ export class Module {
     expr: ExpressionRef
   ): ExpressionRef {
     if (isNullableType(getExpressionType(expr))) {
-      return binaryen._BinaryenRefIs(this.ref, RefIsOp.RefIsNull, expr);
+      return binaryen._BinaryenRefIs(this.ref, RefIsOp.Null, expr);
     } else {
       return this.i32(0); // false literal
     }
@@ -1897,7 +1897,7 @@ export class Module {
     expr: ExpressionRef
   ): ExpressionRef {
     if (isNullableType(getExpressionType(expr))) {
-      return binaryen._BinaryenRefAs(this.ref, RefAsOp.RefAsNonNull, expr);
+      return binaryen._BinaryenRefAs(this.ref, RefAsOp.NonNull, expr);
     } else {
       return expr;
     }

From 92ec1c79f9f78a5f8111d4530100078b7d157917 Mon Sep 17 00:00:00 2001
From: MaxGraey <maxgraey@gmail.com>
Date: Fri, 26 Aug 2022 14:09:13 +0300
Subject: [PATCH 2/2] fix

---
 src/builtins.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/builtins.ts b/src/builtins.ts
index f08f789f48..dc61f365c0 100644
--- a/src/builtins.ts
+++ b/src/builtins.ts
@@ -3473,7 +3473,7 @@ function builtin_assert(ctx: BuiltinContext): ExpressionRef {
       case TypeKind.ANYREF:
       case TypeKind.EQREF:
       case TypeKind.DATAREF:
-      case TypeKind.I31REF: return module.if(module.ref_is(RefIsOp.RefIsNull, arg0), abort);
+      case TypeKind.I31REF: return module.if(module.ref_is(RefIsOp.Null, arg0), abort);
 
     }
   } else {
@@ -3558,7 +3558,7 @@ function builtin_assert(ctx: BuiltinContext): ExpressionRef {
       case TypeKind.I31REF: {
         let temp = flow.getTempLocal(type);
         let ret = module.if(
-          module.ref_is(RefIsOp.RefIsNull,
+          module.ref_is(RefIsOp.Null,
             module.local_tee(temp.index, arg0, false) // ref
           ),
           abort,