Remove exnref and br_on_exn (#3505)

This removes `exnref` type and `br_on_exn` instruction.

1 files changed, 1 insertions, 22 deletions

diff --git a/src/tools/fuzzing.h b/src/tools/fuzzing.h
index 749e6c31f..7e5a56ab1 100644
--- a/src/tools/fuzzing.h
+++ b/src/tools/fuzzing.h
@@ -335,9 +335,6 @@ private:
           if (wasm.features.hasReferenceTypes()) {
             options.push_back(Type::funcref);
             options.push_back(Type::externref);
-            if (wasm.features.hasExceptionHandling()) {
-              options.push_back(Type::exnref);
-            }
             if (wasm.features.hasGC()) {
               options.push_back(Type::eqref);
               options.push_back(Type::i31ref);
@@ -871,8 +868,6 @@ private:
 
       void visitBreak(Break* curr) { replaceIfInvalid(curr->name); }
 
-      void visitBrOnExn(BrOnExn* curr) { replaceIfInvalid(curr->name); }
-
       bool replaceIfInvalid(Name target) {
         if (!hasBreakTarget(target)) {
           // There is no valid parent, replace with something trivially safe.
@@ -1648,7 +1643,6 @@ private:
       }
       case Type::funcref:
       case Type::externref:
-      case Type::exnref:
       case Type::anyref:
       case Type::eqref:
       case Type::i31ref:
@@ -1755,7 +1749,6 @@ private:
       }
       case Type::funcref:
       case Type::externref:
-      case Type::exnref:
       case Type::anyref:
       case Type::eqref:
       case Type::i31ref:
@@ -1892,7 +1885,6 @@ private:
           case Type::v128:
           case Type::funcref:
           case Type::externref:
-          case Type::exnref:
           case Type::anyref:
           case Type::eqref:
           case Type::i31ref:
@@ -1940,7 +1932,6 @@ private:
           case Type::v128:
           case Type::funcref:
           case Type::externref:
-          case Type::exnref:
           case Type::anyref:
           case Type::eqref:
           case Type::i31ref:
@@ -2013,7 +2004,6 @@ private:
           case Type::v128:
           case Type::funcref:
           case Type::externref:
-          case Type::exnref:
           case Type::anyref:
           case Type::eqref:
           case Type::i31ref:
@@ -2043,7 +2033,6 @@ private:
           case Type::v128:
           case Type::funcref:
           case Type::externref:
-          case Type::exnref:
           case Type::anyref:
           case Type::eqref:
           case Type::i31ref:
@@ -2182,7 +2171,6 @@ private:
           }
           case Type::funcref:
           case Type::externref:
-          case Type::exnref:
           case Type::anyref:
           case Type::eqref:
           case Type::i31ref:
@@ -2331,7 +2319,6 @@ private:
       }
       case Type::funcref:
       case Type::externref:
-      case Type::exnref:
       case Type::anyref:
       case Type::eqref:
       case Type::i31ref:
@@ -2574,7 +2561,6 @@ private:
       }
       case Type::funcref:
       case Type::externref:
-      case Type::exnref:
       case Type::anyref:
       case Type::eqref:
       case Type::i31ref:
@@ -2782,7 +2768,6 @@ private:
       case Type::v128:
       case Type::funcref:
       case Type::externref:
-      case Type::exnref:
       case Type::anyref:
       case Type::eqref:
       case Type::i31ref:
@@ -3047,8 +3032,6 @@ private:
         .add(FeatureSet::MVP, Type::i32, Type::i64, Type::f32, Type::f64)
         .add(FeatureSet::SIMD, Type::v128)
         .add(FeatureSet::ReferenceTypes, Type::funcref, Type::externref)
-        .add(FeatureSet::ReferenceTypes | FeatureSet::ExceptionHandling,
-             Type::exnref)
         .add(FeatureSet::ReferenceTypes | FeatureSet::GC,
              Type::anyref,
              Type::eqref,
@@ -3063,8 +3046,6 @@ private:
     return items(
       FeatureOptions<Type>()
         .add(FeatureSet::ReferenceTypes, Type::funcref, Type::externref)
-        .add(FeatureSet::ReferenceTypes | FeatureSet::ExceptionHandling,
-             Type::exnref)
         .add(FeatureSet::ReferenceTypes | FeatureSet::GC,
              Type::anyref,
              Type::eqref,
@@ -3137,9 +3118,7 @@ private:
       loggableTypes = items(
         FeatureOptions<Type>()
           .add(FeatureSet::MVP, Type::i32, Type::i64, Type::f32, Type::f64)
-          .add(FeatureSet::SIMD, Type::v128)
-          .add(FeatureSet::ReferenceTypes | FeatureSet::ExceptionHandling,
-               Type::exnref));
+          .add(FeatureSet::SIMD, Type::v128));
     }
     return loggableTypes;
   }