1 files changed, 23 insertions, 23 deletions

diff --git a/src/tools/fuzzing.h b/src/tools/fuzzing.h
index 80945eb9e..1d68219e2 100644
--- a/src/tools/fuzzing.h
+++ b/src/tools/fuzzing.h
@@ -25,7 +25,7 @@ high chance for set at start of loop
     high chance of a tee in that case => loop var
 */
 
-// TODO Complete except_ref type support. Its support is partialy implemented
+// TODO Complete exnref type support. Its support is partialy implemented
 // and the type is currently not generated in fuzzed programs yet.
 
 #include "ir/memory-utils.h"
@@ -851,7 +851,7 @@ private:
       case f32:
       case f64:
       case v128:
-      case except_ref:
+      case exnref:
         ret = _makeConcrete(type);
         break;
       case none:
@@ -1363,7 +1363,7 @@ private:
         return builder.makeLoad(
           16, false, offset, pick(1, 2, 4, 8, 16), ptr, type);
       }
-      case except_ref: // except_ref cannot be loaded from memory
+      case exnref: // exnref cannot be loaded from memory
       case none:
       case unreachable:
         WASM_UNREACHABLE();
@@ -1372,8 +1372,8 @@ private:
   }
 
   Expression* makeLoad(Type type) {
-    // except_ref type cannot be stored in memory
-    if (!allowMemory || type == except_ref) {
+    // exnref type cannot be stored in memory
+    if (!allowMemory || type == exnref) {
       return makeTrivial(type);
     }
     auto* ret = makeNonAtomicLoad(type);
@@ -1464,7 +1464,7 @@ private:
         return builder.makeStore(
           16, offset, pick(1, 2, 4, 8, 16), ptr, value, type);
       }
-      case except_ref: // except_ref cannot be stored in memory
+      case exnref: // exnref cannot be stored in memory
       case none:
       case unreachable:
         WASM_UNREACHABLE();
@@ -1473,8 +1473,8 @@ private:
   }
 
   Expression* makeStore(Type type) {
-    // except_ref type cannot be stored in memory
-    if (!allowMemory || type == except_ref) {
+    // exnref type cannot be stored in memory
+    if (!allowMemory || type == exnref) {
       return makeTrivial(type);
     }
     auto* ret = makeNonAtomicStore(type);
@@ -1559,7 +1559,7 @@ private:
           case f64:
             return Literal(getDouble());
           case v128:
-          case except_ref: // except_ref cannot have literals
+          case exnref: // exnref cannot have literals
           case none:
           case unreachable:
             WASM_UNREACHABLE();
@@ -1601,7 +1601,7 @@ private:
           case f64:
             return Literal(double(small));
           case v128:
-          case except_ref: // except_ref cannot have literals
+          case exnref: // exnref cannot have literals
           case none:
           case unreachable:
             WASM_UNREACHABLE();
@@ -1666,7 +1666,7 @@ private:
                                          std::numeric_limits<uint64_t>::max()));
             break;
           case v128:
-          case except_ref: // except_ref cannot have literals
+          case exnref: // exnref cannot have literals
           case none:
           case unreachable:
             WASM_UNREACHABLE();
@@ -1697,7 +1697,7 @@ private:
             value = Literal(double(int64_t(1) << upTo(64)));
             break;
           case v128:
-          case except_ref: // except_ref cannot have literals
+          case exnref: // exnref cannot have literals
           case none:
           case unreachable:
             WASM_UNREACHABLE();
@@ -1721,11 +1721,11 @@ private:
   }
 
   Expression* makeConst(Type type) {
-    if (type == except_ref) {
-      // There's no except_ref.const.
+    if (type == exnref) {
+      // There's no exnref.const.
       // TODO We should return a nullref once we implement instructions for
       // reference types proposal.
-      assert(false && "except_ref const is not implemented yet");
+      assert(false && "exnref const is not implemented yet");
     }
     auto* ret = wasm.allocator.alloc<Const>();
     ret->value = makeLiteral(type);
@@ -1745,8 +1745,8 @@ private:
       // give up
       return makeTrivial(type);
     }
-    // There's no binary ops for except_ref
-    if (type == except_ref) {
+    // There's no binary ops for exnref
+    if (type == exnref) {
       makeTrivial(type);
     }
 
@@ -1795,7 +1795,7 @@ private:
                                     AllTrueVecI64x2),
                                make(v128)});
           }
-          case except_ref: // there's no unary ops for except_ref
+          case exnref: // there's no unary ops for exnref
           case none:
           case unreachable:
             WASM_UNREACHABLE();
@@ -1926,7 +1926,7 @@ private:
         }
         WASM_UNREACHABLE();
       }
-      case except_ref: // there's no unary ops for except_ref
+      case exnref: // there's no unary ops for exnref
       case none:
       case unreachable:
         WASM_UNREACHABLE();
@@ -1947,8 +1947,8 @@ private:
       // give up
       return makeTrivial(type);
     }
-    // There's no binary ops for except_ref
-    if (type == except_ref) {
+    // There's no binary ops for exnref
+    if (type == exnref) {
       makeTrivial(type);
     }
 
@@ -2139,7 +2139,7 @@ private:
                             make(v128),
                             make(v128)});
       }
-      case except_ref: // there's no binary ops for except_ref
+      case exnref: // there's no binary ops for exnref
       case none:
       case unreachable:
         WASM_UNREACHABLE();
@@ -2333,7 +2333,7 @@ private:
         op = ExtractLaneVecF64x2;
         break;
       case v128:
-      case except_ref:
+      case exnref:
       case none:
       case unreachable:
         WASM_UNREACHABLE();