From 08436189d3f35c958872b34bf8b0a8575e186d27 Mon Sep 17 00:00:00 2001 From: Thomas Lively Date: Thu, 18 Jul 2024 13:54:21 -0400 Subject: [threads] Simplify and generalize reftype writing without GC (#6766) Similar to #6765, but for types instead of heap types. Generalize the logic for transforming written reference types to types that are supported without GC so that it will automatically handle shared types and other new types correctly. --- src/wasm/wasm-binary.cpp | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) (limited to 'src/wasm/wasm-binary.cpp') diff --git a/src/wasm/wasm-binary.cpp b/src/wasm/wasm-binary.cpp index d35edadc8..20815b701 100644 --- a/src/wasm/wasm-binary.cpp +++ b/src/wasm/wasm-binary.cpp @@ -1520,23 +1520,15 @@ void WasmBinaryWriter::writeType(Type type) { // internally use more refined versions of those types, but we cannot emit // those more refined types. if (!wasm->features.hasGC()) { - if (Type::isSubType(type, Type(HeapType::func, Nullable))) { - o << S32LEB(BinaryConsts::EncodedType::funcref); - return; - } - if (Type::isSubType(type, Type(HeapType::ext, Nullable))) { - o << S32LEB(BinaryConsts::EncodedType::externref); - return; - } - if (Type::isSubType(type, Type(HeapType::exn, Nullable))) { - o << S32LEB(BinaryConsts::EncodedType::exnref); - return; - } - if (Type::isSubType(type, Type(HeapType::string, Nullable))) { - o << S32LEB(BinaryConsts::EncodedType::stringref); - return; + auto ht = type.getHeapType(); + if (ht.isBasic() && ht.getBasic(Unshared) == HeapType::string) { + // Do not overgeneralize stringref to anyref. We have tests that when a + // stringref is expected, we actually get a stringref. If we see a + // string, the stringref feature must be enabled. + type = Type(HeapTypes::string.getBasic(ht.getShared()), Nullable); + } else { + type = Type(type.getHeapType().getTop(), Nullable); } - WASM_UNREACHABLE("bad type without GC"); } auto heapType = type.getHeapType(); if (type.isNullable() && heapType.isBasic() && !heapType.isShared()) { -- cgit v1.2.3