fix

src/wasm/wasm-binary.cpp

@@ -2429,7 +2429,7 @@ void WasmBinaryReader::readTypes() {
       if (!type.isRef()) {
         throwError("unexpected exact prefix on non-reference type");
       }
-      return builder.getTempRefType(
+      return typebuilder.getTempRefType(
         type.getHeapType(), type.getNullability(), Exact);
     }
     return makeTypeNoExact(typeCode);
@@ -4459,30 +4459,35 @@ void WasmBinaryReader::readExports() {
       throwError("duplicate export name");
     }
     ExternalKind kind = (ExternalKind)getU32LEB();
-    std::variant<Name, HeapType> value;
-    switch (kind) {
-      case ExternalKind::Function:
-        value = getFunctionName(getU32LEB());
-        break;
-      case ExternalKind::Table:
-        value = getTableName(getU32LEB());
-        break;
-      case ExternalKind::Memory:
-        value = getMemoryName(getU32LEB());
-        break;
-      case ExternalKind::Global:
-        value = getGlobalName(getU32LEB());
-        break;
-      case ExternalKind::Tag:
-        value = getTagName(getU32LEB());
-        break;
-      case ExternalKind::Type:
-        value = getHeapType();
-        break;
-      case ExternalKind::Invalid:
-        throwError("invalid export kind");
+    if (kind == ExternalKind::Type) {
+      auto curr = std::make_unique<TypeExport>();
+      curr->name = name;
+      auto* ex = wasm.addTypeExport(std::move(curr));
+      ex->heaptype = getHeapType();
+    } else {
+      std::variant<Name, HeapType> value;
+      switch (kind) {
+        case ExternalKind::Function:
+          value = getFunctionName(getU32LEB());
+          break;
+        case ExternalKind::Table:
+          value = getTableName(getU32LEB());
+          break;
+        case ExternalKind::Memory:
+          value = getMemoryName(getU32LEB());
+          break;
+        case ExternalKind::Global:
+          value = getGlobalName(getU32LEB());
+          break;
+        case ExternalKind::Tag:
+          value = getTagName(getU32LEB());
+          break;
+        case ExternalKind::Type:
+        case ExternalKind::Invalid:
+          throwError("invalid export kind");
+      }
+      wasm.addExport(new Export(name, kind, value));
     }
-    wasm.addExport(new Export(name, kind, value));
   }
 }
 

test/binaryen.js/kitchen-sink.js.txt

@@ -33,7 +33,7 @@ Features.RelaxedSIMD: 4096
 Features.ExtendedConst: 8192
 Features.Strings: 16384
 Features.MultiMemory: 32768
-Features.All: 4194303
+Features.All: 8388607
 InvalidId: 0
 BlockId: 1
 IfId: 2

test/example/c-api-kitchen-sink.txt

@@ -47,7 +47,7 @@ BinaryenFeatureMemory64: 2048
 BinaryenFeatureRelaxedSIMD: 4096
 BinaryenFeatureExtendedConst: 8192
 BinaryenFeatureStrings: 16384
-BinaryenFeatureAll: 4194303
+BinaryenFeatureAll: 8388607
 (f32.neg
  (f32.const -33.61199951171875)
 )