diff options
Diffstat (limited to 'src/wasm')
-rw-r--r-- | src/wasm/wasm-binary.cpp | 12 | ||||
-rw-r--r-- | src/wasm/wasm-stack.cpp | 8 | ||||
-rw-r--r-- | src/wasm/wasm-validator.cpp | 12 | ||||
-rw-r--r-- | src/wasm/wasm.cpp | 4 |
4 files changed, 18 insertions, 18 deletions
diff --git a/src/wasm/wasm-binary.cpp b/src/wasm/wasm-binary.cpp index c4aaec5e9..78470324c 100644 --- a/src/wasm/wasm-binary.cpp +++ b/src/wasm/wasm-binary.cpp @@ -4329,8 +4329,8 @@ BinaryConsts::ASTNodes WasmBinaryReader::readExpression(Expression*& curr) { if (maybeVisitStringSliceWTF(curr, opcode)) { break; } - if (opcode == BinaryConsts::ExternInternalize || - opcode == BinaryConsts::ExternExternalize) { + if (opcode == BinaryConsts::AnyConvertExtern || + opcode == BinaryConsts::ExternConvertAny) { visitRefAs((curr = allocator.alloc<RefAs>())->cast<RefAs>(), opcode); break; } @@ -7730,11 +7730,11 @@ void WasmBinaryReader::visitRefAs(RefAs* curr, uint8_t code) { case BinaryConsts::RefAsNonNull: curr->op = RefAsNonNull; break; - case BinaryConsts::ExternInternalize: - curr->op = ExternInternalize; + case BinaryConsts::AnyConvertExtern: + curr->op = AnyConvertExtern; break; - case BinaryConsts::ExternExternalize: - curr->op = ExternExternalize; + case BinaryConsts::ExternConvertAny: + curr->op = ExternConvertAny; break; default: WASM_UNREACHABLE("invalid code for ref.as_*"); diff --git a/src/wasm/wasm-stack.cpp b/src/wasm/wasm-stack.cpp index ac117e2e0..40a50706a 100644 --- a/src/wasm/wasm-stack.cpp +++ b/src/wasm/wasm-stack.cpp @@ -2334,13 +2334,13 @@ void BinaryInstWriter::visitRefAs(RefAs* curr) { case RefAsNonNull: o << int8_t(BinaryConsts::RefAsNonNull); break; - case ExternInternalize: + case AnyConvertExtern: o << int8_t(BinaryConsts::GCPrefix) - << U32LEB(BinaryConsts::ExternInternalize); + << U32LEB(BinaryConsts::AnyConvertExtern); break; - case ExternExternalize: + case ExternConvertAny: o << int8_t(BinaryConsts::GCPrefix) - << U32LEB(BinaryConsts::ExternExternalize); + << U32LEB(BinaryConsts::ExternConvertAny); break; default: WASM_UNREACHABLE("invalid ref.as_*"); diff --git a/src/wasm/wasm-validator.cpp b/src/wasm/wasm-validator.cpp index a491fb951..9732f54a9 100644 --- a/src/wasm/wasm-validator.cpp +++ b/src/wasm/wasm-validator.cpp @@ -2215,30 +2215,30 @@ void FunctionValidator::visitRefAs(RefAs* curr) { default: // TODO: validate all the other ref.as_* break; - case ExternInternalize: { + case AnyConvertExtern: { shouldBeTrue(getModule()->features.hasGC(), curr, - "extern.internalize requries GC [--enable-gc]"); + "any.convert_extern requries GC [--enable-gc]"); if (curr->type == Type::unreachable) { return; } shouldBeSubType(curr->value->type, Type(HeapType::ext, Nullable), curr->value, - "extern.internalize value should be an externref"); + "any.convert_extern value should be an externref"); break; } - case ExternExternalize: { + case ExternConvertAny: { shouldBeTrue(getModule()->features.hasGC(), curr, - "extern.externalize requries GC [--enable-gc]"); + "extern.convert_any requries GC [--enable-gc]"); if (curr->type == Type::unreachable) { return; } shouldBeSubType(curr->value->type, Type(HeapType::any, Nullable), curr->value, - "extern.externalize value should be an anyref"); + "extern.convert_any value should be an anyref"); break; } } diff --git a/src/wasm/wasm.cpp b/src/wasm/wasm.cpp index ed05e9b47..58699ad8b 100644 --- a/src/wasm/wasm.cpp +++ b/src/wasm/wasm.cpp @@ -1231,10 +1231,10 @@ void RefAs::finalize() { case RefAsNonNull: type = Type(value->type.getHeapType(), NonNullable); break; - case ExternInternalize: + case AnyConvertExtern: type = Type(HeapType::any, value->type.getNullability()); break; - case ExternExternalize: + case ExternConvertAny: type = Type(HeapType::ext, value->type.getNullability()); break; default: |