4 files changed, 22 insertions, 80 deletions
diff --git a/test/binaryen.js/expressions.js b/test/binaryen.js/expressions.js
index 603ca3250..a49546b91 100644
--- a/test/binaryen.js/expressions.js
+++ b/test/binaryen.js/expressions.js
@@ -1581,43 +1581,6 @@ console.log("# Rethrow");
   module.dispose();
 })();
 
-console.log("# BrOnExn");
-(function testBrOnExn() {
-  const module = new binaryen.Module();
-  module.addEvent("event1", 0, binaryen.none, binaryen.none);
-  module.addEvent("event2", 0, binaryen.none, binaryen.none);
-
-  var name = "foo";
-  var event = "event1";
-  var exnref = module.local.get(1, binaryen.exnref);
-  const theBrOnExn = binaryen.BrOnExn(module.br_on_exn(name, event, exnref));
-  assert(theBrOnExn instanceof binaryen.BrOnExn);
-  assert(theBrOnExn instanceof binaryen.Expression);
-  assert(theBrOnExn.name === name);
-  assert(theBrOnExn.event === event);
-  assert(theBrOnExn.exnref === exnref);
-  assert(theBrOnExn.type === binaryen.exnref);
-
-  theBrOnExn.name = name = "bar";
-  assert(theBrOnExn.name === name);
-  theBrOnExn.event = event = "event2";
-  assert(theBrOnExn.event === event);
-  theBrOnExn.exnref = exnref = module.local.get(2, binaryen.exnref);
-  assert(theBrOnExn.exnref === exnref);
-  theBrOnExn.type = binaryen.f64;
-  theBrOnExn.finalize();
-  assert(theBrOnExn.type === binaryen.exnref);
-
-  console.log(theBrOnExn.toText());
-  assert(
-    theBrOnExn.toText()
-    ==
-    "(br_on_exn $bar $event2\n (local.get $2)\n)\n"
-  );
-
-  module.dispose();
-})();
-
 console.log("# TupleMake");
 (function testTupleMake() {
   const module = new binaryen.Module();
diff --git a/test/binaryen.js/expressions.js.txt b/test/binaryen.js/expressions.js.txt
index d6c090d18..f5645ff1c 100644
--- a/test/binaryen.js/expressions.js.txt
+++ b/test/binaryen.js/expressions.js.txt
@@ -292,11 +292,6 @@
 # Rethrow
 (rethrow 1)
 
-# BrOnExn
-(br_on_exn $bar $event2
- (local.get $2)
-)
-
 # TupleMake
 (tuple.make
  (i32.const 6)
diff --git a/test/binaryen.js/kitchen-sink.js b/test/binaryen.js/kitchen-sink.js
index 8e7e81f26..160054fde 100644
--- a/test/binaryen.js/kitchen-sink.js
+++ b/test/binaryen.js/kitchen-sink.js
@@ -74,9 +74,6 @@ function test_types() {
   console.log("  // BinaryenTypeExternref: " + binaryen.externref);
   console.log("  //", binaryen.expandType(binaryen.externref).join(","));
 
-  console.log("  // BinaryenTypeExnref: " + binaryen.exnref);
-  console.log("  //", binaryen.expandType(binaryen.exnref).join(","));
-
   console.log("  // BinaryenTypeAnyref: " + binaryen.anyref);
   console.log("  //", binaryen.expandType(binaryen.anyref).join(","));
 
@@ -164,7 +161,6 @@ function test_ids() {
   console.log("TryId: " + binaryen.TryId);
   console.log("ThrowId: " + binaryen.ThrowId);
   console.log("RethrowId: " + binaryen.RethrowId);
-  console.log("BrOnExnId: " + binaryen.BrOnExnId);
   console.log("TupleMakeId: " + binaryen.TupleMakeId);
   console.log("TupleExtractId: " + binaryen.TupleExtractId);
   console.log("I31NewId: " + binaryen.I31NewId);
@@ -591,7 +587,6 @@ function test_core() {
     module.v128.pop(),
     module.funcref.pop(),
     module.externref.pop(),
-    module.exnref.pop(),
     module.anyref.pop(),
     module.eqref.pop(),
     module.i31ref.pop(),
@@ -642,7 +637,7 @@ function test_core() {
   var body = module.block("the-body", [ nothing, makeInt32(42) ]);
 
   // Create the function
-  var sinker = module.addFunction("kitchen()sinker", iIfF, binaryen.i32, [ binaryen.i32, binaryen.exnref ], body);
+  var sinker = module.addFunction("kitchen()sinker", iIfF, binaryen.i32, [ binaryen.i32 ], body);
 
   // Create a global
   var initExpr = module.i32.const(1);
diff --git a/test/binaryen.js/kitchen-sink.js.txt b/test/binaryen.js/kitchen-sink.js.txt
index 204dd800c..f73990493 100644
--- a/test/binaryen.js/kitchen-sink.js.txt
+++ b/test/binaryen.js/kitchen-sink.js.txt
@@ -16,14 +16,12 @@
   // 7
   // BinaryenTypeExternref: 8
   // 8
-  // BinaryenTypeExnref: 9
+  // BinaryenTypeAnyref: 9
   // 9
-  // BinaryenTypeAnyref: 10
+  // BinaryenTypeEqref: 10
   // 10
-  // BinaryenTypeEqref: 11
-  // 11
-  // BinaryenTypeI31ref: 13
-  // 13
+  // BinaryenTypeI31ref: 12
+  // 12
   // BinaryenTypeAuto: -1
   // 2,2
   // 2,2
@@ -88,24 +86,23 @@ RefEqId: 45
 TryId: 46
 ThrowId: 47
 RethrowId: 48
-BrOnExnId: 49
-TupleMakeId: 50
-TupleExtractId: 51
-I31NewId: 52
-I31GetId: 53
-CallRefId: 54
-RefTestId: 55
-RefCastId: 56
-BrOnCastId: 57
-RttCanonId: 58
-RttSubId: 59
-StructNewId: 60
-StructGetId: 61
-StructSetId: 62
-ArrayNewId: 63
-ArrayGetId: 64
-ArraySetId: 65
-ArrayLenId: 66
+TupleMakeId: 49
+TupleExtractId: 50
+I31NewId: 51
+I31GetId: 52
+CallRefId: 53
+RefTestId: 54
+RefCastId: 55
+BrOnCastId: 56
+RttCanonId: 57
+RttSubId: 58
+StructNewId: 59
+StructGetId: 60
+StructSetId: 61
+ArrayNewId: 62
+ArrayGetId: 63
+ArraySetId: 64
+ArrayLenId: 65
 getExpressionInfo={"id":15,"type":4,"op":6}
 (f32.neg
  (f32.const -33.61199951171875)
@@ -142,7 +139,6 @@ getExpressionInfo(tuple[3])={"id":14,"type":5,"value":3.7}
  (start $starter)
  (func "$kitchen()sinker" (param $0 i32) (param $1 i64) (param $2 f32) (param $3 f64) (result i32)
   (local $4 i32)
-  (local $5 exnref)
   (block $the-body (result i32)
    (block $the-nothing
     (drop
@@ -1931,9 +1927,6 @@ getExpressionInfo(tuple[3])={"id":14,"type":5,"value":3.7}
        (pop externref)
       )
       (drop
-       (pop exnref)
-      )
-      (drop
        (pop anyref)
       )
       (drop
@@ -2005,7 +1998,6 @@ getExpressionInfo(tuple[3])={"id":14,"type":5,"value":3.7}
  (start $starter)
  (func "$kitchen()sinker" (param $0 i32) (param $1 i64) (param $2 f32) (param $3 f64) (result i32)
   (local $4 i32)
-  (local $5 exnref)
   (block $the-body (result i32)
    (block $the-nothing
     (drop
@@ -3794,9 +3786,6 @@ getExpressionInfo(tuple[3])={"id":14,"type":5,"value":3.7}
        (pop externref)
       )
       (drop
-       (pop exnref)
-      )
-      (drop
        (pop anyref)
       )
       (drop