WebKit Bugzilla
Attachment 370091 Details for
Bug 197969
: [WASM-References] Add support for Anyref in parameters and return types, Ref.null and Ref.is_null for Anyref values.
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-197969-20190516164259.patch (text/plain), 34.13 KB, created by
Justin Michaud
on 2019-05-16 16:43:00 PDT
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Justin Michaud
Created:
2019-05-16 16:43:00 PDT
Size:
34.13 KB
patch
obsolete
>Subversion Revision: 245241 >diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog >index 56fb367de271ea35ed83a12b240ab79618bda024..8a1997c5155b779728741e765d3a9500da07eb12 100644 >--- a/Source/JavaScriptCore/ChangeLog >+++ b/Source/JavaScriptCore/ChangeLog >@@ -1,3 +1,43 @@ >+2019-05-16 Justin Michaud <justin_michaud@apple.com> >+ >+ [WASM-References] Add support for Anyref in parameters and return types, Ref.null and Ref.is_null for Anyref values. >+ https://bugs.webkit.org/show_bug.cgi?id=197969 >+ >+ Add support for Anyref in parameters and return types of Wasm functions. >+ Add Ref.null and Ref.is_null for Anyref values. Support for these functions with funcrefs is out of scope. >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * wasm/WasmAirIRGenerator.cpp: >+ (JSC::Wasm::AirIRGenerator::tmpForType): >+ (JSC::Wasm::AirIRGenerator::AirIRGenerator): >+ (JSC::Wasm::AirIRGenerator::addConstant): >+ (JSC::Wasm::AirIRGenerator::addRefIsNull): >+ (JSC::Wasm::AirIRGenerator::addReturn): >+ * wasm/WasmB3IRGenerator.cpp: >+ (JSC::Wasm::B3IRGenerator::addRefIsNull): >+ * wasm/WasmCallingConvention.h: >+ (JSC::Wasm::CallingConventionAir::marshallArgument const): >+ (JSC::Wasm::CallingConventionAir::setupCall const): >+ * wasm/WasmFormat.h: >+ (JSC::Wasm::isValueType): >+ * wasm/WasmFunctionParser.h: >+ (JSC::Wasm::FunctionParser<Context>::FunctionParser): >+ (JSC::Wasm::FunctionParser<Context>::parseExpression): >+ (JSC::Wasm::FunctionParser<Context>::parseUnreachableExpression): >+ * wasm/WasmValidate.cpp: >+ (JSC::Wasm::Validate::addRefIsNull): >+ * wasm/generateWasmOpsHeader.py: >+ (bitSet): >+ * wasm/js/JSToWasm.cpp: >+ (JSC::Wasm::createJSToWasmWrapper): >+ * wasm/js/WasmToJS.cpp: >+ (JSC::Wasm::wasmToJS): >+ * wasm/js/WebAssemblyFunction.cpp: >+ (JSC::callWebAssemblyFunction): >+ (JSC::WebAssemblyFunction::jsCallEntrypointSlow): >+ * wasm/wasm.json: >+ > 2019-05-13 Yusuke Suzuki <ysuzuki@apple.com> > > [JSC] Compress miscelaneous JIT related data structures with Packed<> >diff --git a/Source/JavaScriptCore/wasm/WasmAirIRGenerator.cpp b/Source/JavaScriptCore/wasm/WasmAirIRGenerator.cpp >index 26a400dfbf5132d7e37a156934aa605a411667ce..88a267f427cf499b6b69282eb6e0a2d5a3726b00 100644 >--- a/Source/JavaScriptCore/wasm/WasmAirIRGenerator.cpp >+++ b/Source/JavaScriptCore/wasm/WasmAirIRGenerator.cpp >@@ -229,6 +229,8 @@ public: > ExpressionType addConstant(Type, uint64_t); > ExpressionType addConstant(BasicBlock*, Type, uint64_t); > >+ PartialResult WARN_UNUSED_RETURN addRefIsNull(ExpressionType& value, ExpressionType& result); >+ > // Locals > PartialResult WARN_UNUSED_RETURN getLocal(uint32_t index, ExpressionType& result); > PartialResult WARN_UNUSED_RETURN setLocal(uint32_t index, ExpressionType value); >@@ -359,6 +361,7 @@ private: > case Type::I32: > return g32(); > case Type::I64: >+ case Type::Anyref: > return g64(); > case Type::F32: > return f32(); >@@ -785,6 +788,7 @@ AirIRGenerator::AirIRGenerator(const ModuleInformation& info, B3::Procedure& pro > append(Move32, arg, m_locals[i]); > break; > case Type::I64: >+ case Type::Anyref: > append(Move, arg, m_locals[i]); > break; > case Type::F32: >@@ -894,6 +898,7 @@ auto AirIRGenerator::addConstant(BasicBlock* block, Type type, uint64_t value) - > switch (type) { > case Type::I32: > case Type::I64: >+ case Type::Anyref: > append(block, Move, Arg::bigImm(value), result); > break; > case Type::F32: >@@ -917,6 +922,16 @@ auto AirIRGenerator::addArguments(const Signature& signature) -> PartialResult > return { }; > } > >+auto AirIRGenerator::addRefIsNull(ExpressionType& value, ExpressionType& result) -> PartialResult >+{ >+ ASSERT(value.tmp()); >+ result = tmpForType(Type::I32); >+ >+ append(Test64, Arg::resCond(MacroAssembler::Zero), value, value, result); >+ >+ return { }; >+} >+ > auto AirIRGenerator::getLocal(uint32_t index, ExpressionType& result) -> PartialResult > { > ASSERT(m_locals[index].tmp()); >@@ -1501,6 +1516,7 @@ auto AirIRGenerator::addReturn(const ControlData& data, const ExpressionList& re > append(Ret32, returnValueGPR); > break; > case Type::I64: >+ case Type::Anyref: > append(Move, returnValues[0], returnValueGPR); > append(Ret64, returnValueGPR); > break; >diff --git a/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp b/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp >index aee8b4da0048515ec5c8bd89294570b8dc0606c9..2b9f341685b8b5573cb2ce475040ef4e55634aef 100644 >--- a/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp >+++ b/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp >@@ -183,6 +183,8 @@ public: > PartialResult WARN_UNUSED_RETURN addLocal(Type, uint32_t); > ExpressionType addConstant(Type, uint64_t); > >+ PartialResult WARN_UNUSED_RETURN addRefIsNull(ExpressionType& value, ExpressionType& result); >+ > // Locals > PartialResult WARN_UNUSED_RETURN getLocal(uint32_t index, ExpressionType& result); > PartialResult WARN_UNUSED_RETURN setLocal(uint32_t index, ExpressionType value); >@@ -544,6 +546,12 @@ auto B3IRGenerator::addArguments(const Signature& signature) -> PartialResult > return { }; > } > >+auto B3IRGenerator::addRefIsNull(ExpressionType& value, ExpressionType& result) -> PartialResult >+{ >+ result = m_currentBlock->appendNew<Value>(m_proc, B3::Equal, origin(), value, m_currentBlock->appendNew<Const64Value>(m_proc, origin(), 0)); >+ return { }; >+} >+ > auto B3IRGenerator::getLocal(uint32_t index, ExpressionType& result) -> PartialResult > { > ASSERT(m_locals[index]); >diff --git a/Source/JavaScriptCore/wasm/WasmCallingConvention.h b/Source/JavaScriptCore/wasm/WasmCallingConvention.h >index 31866c20dcbfd09faddcf9872893798e599e0273..10eb8cd4e7336e0ef24dc9be504b7507ce83c752 100644 >--- a/Source/JavaScriptCore/wasm/WasmCallingConvention.h >+++ b/Source/JavaScriptCore/wasm/WasmCallingConvention.h >@@ -235,6 +235,7 @@ private: > switch (type) { > case Type::I32: > case Type::I64: >+ case Type::Anyref: > marshallArgumentImpl(m_gprArgs, gpArgumentCount, stackOffset, regFunc, stackFunc); > break; > case Type::F32: >@@ -299,6 +300,7 @@ public: > break; > case Type::I32: > case Type::I64: >+ case Type::Anyref: > patchpoint->resultConstraint = B3::ValueRep::reg(GPRInfo::returnValueGPR); > break; > default: >diff --git a/Source/JavaScriptCore/wasm/WasmFormat.h b/Source/JavaScriptCore/wasm/WasmFormat.h >index fc69ee5c58a4fac31ac97b4e16ac604f2a14ae8d..3c58d4912d0bc4be7c58a42240e4e849b6db590e 100644 >--- a/Source/JavaScriptCore/wasm/WasmFormat.h >+++ b/Source/JavaScriptCore/wasm/WasmFormat.h >@@ -61,6 +61,7 @@ inline bool isValueType(Type type) > case I64: > case F32: > case F64: >+ case Anyref: > return true; > default: > break; >diff --git a/Source/JavaScriptCore/wasm/WasmFunctionParser.h b/Source/JavaScriptCore/wasm/WasmFunctionParser.h >index 2e028e36662653ecec39e02edb8a20bfd44cda91..3761745eb8c364fdf20291689d872b275b500ac5 100644 >--- a/Source/JavaScriptCore/wasm/WasmFunctionParser.h >+++ b/Source/JavaScriptCore/wasm/WasmFunctionParser.h >@@ -105,7 +105,7 @@ FunctionParser<Context>::FunctionParser(Context& context, const uint8_t* functio > , m_info(info) > { > if (verbose) >- dataLogLn("Parsing function starting at: ", (uintptr_t)functionStart, " of length: ", functionLength); >+ dataLogLn("Parsing function starting at: ", (uintptr_t)functionStart, " of length: ", functionLength, " with signature: ", signature); > m_context.setParser(this); > } > >@@ -281,6 +281,19 @@ auto FunctionParser<Context>::parseExpression() -> PartialResult > return { }; > } > >+ case RefNull: { >+ m_expressionStack.append(m_context.addConstant(Anyref, 0)); >+ return { }; >+ } >+ >+ case RefIsNull: { >+ ExpressionType result, value; >+ WASM_TRY_POP_EXPRESSION_STACK_INTO(value, "ref.is_null"); >+ WASM_TRY_ADD_TO_CONTEXT(addRefIsNull(value, result)); >+ m_expressionStack.append(result); >+ return { }; >+ } >+ > case GetLocal: { > uint32_t index; > ExpressionType result; >@@ -639,6 +652,14 @@ auto FunctionParser<Context>::parseUnreachableExpression() -> PartialResult > return { }; > } > >+ case RefNull: { >+ return { }; >+ } >+ >+ case RefIsNull: { >+ return { }; >+ } >+ > case GrowMemory: > case CurrentMemory: { > uint8_t reserved; >diff --git a/Source/JavaScriptCore/wasm/WasmValidate.cpp b/Source/JavaScriptCore/wasm/WasmValidate.cpp >index bcd477bc20ef7c8aa73beb1a86a3aab91d0bf08a..fd54162008409da36f9694d38912c8efc91428b5 100644 >--- a/Source/JavaScriptCore/wasm/WasmValidate.cpp >+++ b/Source/JavaScriptCore/wasm/WasmValidate.cpp >@@ -100,6 +100,8 @@ public: > Result WARN_UNUSED_RETURN addLocal(Type, uint32_t); > ExpressionType addConstant(Type type, uint64_t) { return type; } > >+ Result WARN_UNUSED_RETURN addRefIsNull(ExpressionType& value, ExpressionType& result); >+ > // Locals > Result WARN_UNUSED_RETURN getLocal(uint32_t index, ExpressionType& result); > Result WARN_UNUSED_RETURN setLocal(uint32_t index, ExpressionType value); >@@ -169,6 +171,14 @@ auto Validate::addArguments(const Signature& signature) -> Result > return { }; > } > >+auto Validate::addRefIsNull(ExpressionType& value, ExpressionType& result) -> Result >+{ >+ result = Type::I32; >+ WASM_VALIDATOR_FAIL_IF(Type::Anyref != value, "ref.is_null to type ", value, " expected ", Type::Anyref); >+ >+ return { }; >+} >+ > auto Validate::addLocal(Type type, uint32_t count) -> Result > { > size_t size = m_locals.size() + count; >diff --git a/Source/JavaScriptCore/wasm/generateWasmOpsHeader.py b/Source/JavaScriptCore/wasm/generateWasmOpsHeader.py >index 0b8d7b0264480af32d9b81c0e2222db7e07b8715..4e9a6656631979d2c9378b637e1b88f0692b751c 100755 >--- a/Source/JavaScriptCore/wasm/generateWasmOpsHeader.py >+++ b/Source/JavaScriptCore/wasm/generateWasmOpsHeader.py >@@ -95,7 +95,7 @@ def ceilDiv(a, b): > > def bitSet(): > v = "" >- for i in range(ceilDiv(maxOpValue, 8)): >+ for i in range(ceilDiv(maxOpValue + 1, 8)): > entry = 0 > for j in range(8): > if i * 8 + j in opValueSet: >diff --git a/Source/JavaScriptCore/wasm/js/JSToWasm.cpp b/Source/JavaScriptCore/wasm/js/JSToWasm.cpp >index e036cef6da41b1b8cfbf18e46b1de3aecb7a70e1..a3baa5178895e54a60afb55989ce96e399009d45 100644 >--- a/Source/JavaScriptCore/wasm/js/JSToWasm.cpp >+++ b/Source/JavaScriptCore/wasm/js/JSToWasm.cpp >@@ -82,6 +82,7 @@ std::unique_ptr<InternalFunction> createJSToWasmWrapper(CompilationContext& comp > argumentsIncludeI64 = true; > FALLTHROUGH; > case Wasm::I32: >+ case Wasm::Anyref: > if (numGPRs >= wasmCallingConvention().m_gprArgs.size()) > totalFrameSize += sizeof(void*); > ++numGPRs; >@@ -164,6 +165,7 @@ std::unique_ptr<InternalFunction> createJSToWasmWrapper(CompilationContext& comp > switch (signature.argument(i)) { > case Wasm::I32: > case Wasm::I64: >+ case Wasm::Anyref: > if (numGPRs >= wasmCallingConvention().m_gprArgs.size()) { > if (signature.argument(i) == Wasm::I32) { > jit.load32(CCallHelpers::Address(GPRInfo::callFrameRegister, jsOffset), scratchReg); >@@ -252,6 +254,13 @@ std::unique_ptr<InternalFunction> createJSToWasmWrapper(CompilationContext& comp > case Wasm::Void: > jit.moveTrustedValue(jsUndefined(), JSValueRegs { GPRInfo::returnValueGPR }); > break; >+ case Wasm::Anyref: { >+ // If 0, this is nullref so it becomes null. Otherwise, it is already a JSValue. >+ auto isNullref = jit.branchIfNotEmpty(GPRInfo::returnValueGPR); >+ jit.moveTrustedValue(jsNull(), JSValueRegs { GPRInfo::returnValueGPR }); >+ isNullref.link(&jit); >+ break; >+ } > case Wasm::I32: > jit.zeroExtend32ToPtr(GPRInfo::returnValueGPR, GPRInfo::returnValueGPR); > jit.boxInt32(GPRInfo::returnValueGPR, JSValueRegs { GPRInfo::returnValueGPR }, DoNotHaveTagRegisters); >diff --git a/Source/JavaScriptCore/wasm/js/WasmToJS.cpp b/Source/JavaScriptCore/wasm/js/WasmToJS.cpp >index 572b0307d032c40b592353e6b6d423bd6fcdbb3c..58c8e19d848ada67aa16cbf0e017af0f2deae074 100644 >--- a/Source/JavaScriptCore/wasm/js/WasmToJS.cpp >+++ b/Source/JavaScriptCore/wasm/js/WasmToJS.cpp >@@ -180,6 +180,20 @@ Expected<MacroAssemblerCodeRef<WasmEntryPtrTag>, BindingFailure> wasmToJS(VM* vm > ++marshalledGPRs; > break; > } >+ case Anyref: { >+ GPRReg gprReg; >+ if (marshalledGPRs < wasmCC.m_gprArgs.size()) >+ gprReg = wasmCC.m_gprArgs[marshalledGPRs].gpr(); >+ else { >+ // We've already spilled all arguments, these registers are available as scratch. >+ gprReg = GPRInfo::argumentGPR0; >+ jit.load64(JIT::Address(GPRInfo::callFrameRegister, frOffset), gprReg); >+ frOffset += sizeof(Register); >+ } >+ jit.store64(gprReg, buffer + bufferOffset); >+ ++marshalledGPRs; >+ break; >+ } > case F32: { > FPRReg fprReg; > if (marshalledFPRs < wasmCC.m_fprArgs.size()) >@@ -241,6 +255,13 @@ Expected<MacroAssemblerCodeRef<WasmEntryPtrTag>, BindingFailure> wasmToJS(VM* vm > case I32: > arg = jsNumber(static_cast<int32_t>(buffer[argNum])); > break; >+ case Anyref: { >+ if (!buffer[argNum]) >+ arg = jsNull(); >+ else >+ arg = JSValue::decode(buffer[argNum]); >+ break; >+ } > case F32: > case F64: > arg = jsNumber(purifyNaN(bitwise_cast<double>(buffer[argNum]))); >@@ -272,6 +293,13 @@ Expected<MacroAssemblerCodeRef<WasmEntryPtrTag>, BindingFailure> wasmToJS(VM* vm > realResult = static_cast<uint64_t>(static_cast<uint32_t>(result.toInt32(exec))); > break; > } >+ case Anyref: { >+ if (result.isNull()) >+ realResult = 0; >+ else >+ realResult = JSValue::encode(result); >+ break; >+ } > case F64: > case F32: { > realResult = bitwise_cast<uint64_t>(result.toNumber(exec)); >@@ -381,6 +409,27 @@ Expected<MacroAssemblerCodeRef<WasmEntryPtrTag>, BindingFailure> wasmToJS(VM* vm > calleeFrameOffset += sizeof(Register); > break; > } >+ case Anyref: { >+ GPRReg gprReg; >+ if (marshalledGPRs < wasmCC.m_gprArgs.size()) >+ gprReg = wasmCC.m_gprArgs[marshalledGPRs].gpr(); >+ else { >+ // We've already spilled all arguments, these registers are available as scratch. >+ gprReg = GPRInfo::argumentGPR0; >+ jit.load64(JIT::Address(GPRInfo::callFrameRegister, frOffset), gprReg); >+ frOffset += sizeof(Register); >+ } >+ ++marshalledGPRs; >+ >+ // If 0, this is nullref so it becomes null. Otherwise, it is already a JSValue. >+ auto isNullref = jit.branchIfNotEmpty(gprReg); >+ jit.moveTrustedValue(jsNull(), JSValueRegs { gprReg }); >+ isNullref.link(&jit); >+ >+ jit.store64(gprReg, calleeFrame.withOffset(calleeFrameOffset)); >+ calleeFrameOffset += sizeof(Register); >+ break; >+ } > case F32: > case F64: > // Skipped: handled below. >@@ -430,6 +479,7 @@ Expected<MacroAssemblerCodeRef<WasmEntryPtrTag>, BindingFailure> wasmToJS(VM* vm > case Anyfunc: > case I64: > RELEASE_ASSERT_NOT_REACHED(); // Handled above. >+ case Anyref: > case I32: > // Skipped: handled above. > if (marshalledGPRs >= wasmCC.m_gprArgs.size()) >@@ -538,6 +588,17 @@ Expected<MacroAssemblerCodeRef<WasmEntryPtrTag>, BindingFailure> wasmToJS(VM* vm > done.link(&jit); > break; > } >+ case Anyref: { >+ // Any JSValue, Ref.func or Ref.null is valid here, and it is impossible to create any other kind of ref from within wasm. >+ // Hence, there are no exception checks. >+ >+ // If null, this is nullref so it becomes 0. Otherwise, it is still a JSValue. >+ auto isNullref = jit.branchIfNotNull(GPRInfo::returnValueGPR); >+ jit.move(JIT::TrustedImm64(0), GPRInfo::returnValueGPR); >+ isNullref.link(&jit); >+ >+ break; >+ } > case F32: { > CCallHelpers::JumpList done; > >diff --git a/Source/JavaScriptCore/wasm/js/WebAssemblyFunction.cpp b/Source/JavaScriptCore/wasm/js/WebAssemblyFunction.cpp >index b344c65fb6ca38c38c48b4fc0c6d87781f26d776..0b7b2b052568b9cb0d634a343910e0f6813cd52c 100644 >--- a/Source/JavaScriptCore/wasm/js/WebAssemblyFunction.cpp >+++ b/Source/JavaScriptCore/wasm/js/WebAssemblyFunction.cpp >@@ -84,6 +84,11 @@ static EncodedJSValue JSC_HOST_CALL callWebAssemblyFunction(ExecState* exec) > case Wasm::I32: > arg = JSValue::decode(arg.toInt32(exec)); > break; >+ case Wasm::Anyref: >+ // All JSValues are valid, but null becomes 0. >+ if (arg.isNull()) >+ arg = JSValue::decode(0); >+ break; > case Wasm::I64: > arg = JSValue(); > break; >@@ -453,6 +458,13 @@ MacroAssemblerCodePtr<JSEntryPtrTag> WebAssemblyFunction::jsCallEntrypointSlow() > isNaN.link(&jit); > break; > } >+ case Wasm::Anyref: { >+ // If 0, this is nullref so it becomes null. Otherwise, it is already a JSValue. >+ auto isNullref = jit.branchIfNotEmpty(GPRInfo::returnValueGPR); >+ jit.moveTrustedValue(jsNull(), JSValueRegs { GPRInfo::returnValueGPR }); >+ isNullref.link(&jit); >+ break; >+ } > case Wasm::I64: > case Wasm::Func: > case Wasm::Anyfunc: >diff --git a/Source/JavaScriptCore/wasm/wasm.json b/Source/JavaScriptCore/wasm/wasm.json >index 31d103f9c8a2022a7144032686e760c40caf3a45..e61aa74c338660e4b5f16a354d52d151060092b0 100644 >--- a/Source/JavaScriptCore/wasm/wasm.json >+++ b/Source/JavaScriptCore/wasm/wasm.json >@@ -12,11 +12,12 @@ > "f32": { "type": "varint7", "value": -3, "b3type": "B3::Float" }, > "f64": { "type": "varint7", "value": -4, "b3type": "B3::Double" }, > "anyfunc": { "type": "varint7", "value": -16, "b3type": "B3::Void" }, >+ "anyref": { "type": "varint7", "value": -17, "b3type": "B3::Int64" }, > "func": { "type": "varint7", "value": -32, "b3type": "B3::Void" }, > "void": { "type": "varint7", "value": -64, "b3type": "B3::Void" } > }, >- "value_type": ["i32", "i64", "f32", "f64"], >- "block_type": ["i32", "i64", "f32", "f64", "void"], >+ "value_type": ["i32", "i64", "f32", "f64", "anyref"], >+ "block_type": ["i32", "i64", "f32", "f64", "void", "anyref"], > "elem_type": ["anyfunc"], > "external_kind": { > "Function": { "type": "uint8", "value": 0 }, >@@ -58,6 +59,8 @@ > "i64.const": { "category": "special", "value": 66, "return": ["i64"], "parameter": [], "immediate": [{"name": "value", "type": "varint64"}], "description": "a constant value interpreted as i64" }, > "f64.const": { "category": "special", "value": 68, "return": ["f64"], "parameter": [], "immediate": [{"name": "value", "type": "double"}], "description": "a constant value interpreted as f64" }, > "f32.const": { "category": "special", "value": 67, "return": ["f32"], "parameter": [], "immediate": [{"name": "value", "type": "float"}], "description": "a constant value interpreted as f32" }, >+ "ref.null": { "category": "special", "value": 208, "return": ["anyref"], "parameter": [], "immediate": [], "description": "a constant null reference" }, >+ "ref.is_null": { "category": "special", "value": 209, "return": ["i32"], "parameter": ["anyref"], "immediate": [], "description": "determine if a reference is null" }, > "get_local": { "category": "special", "value": 32, "return": ["any"], "parameter": [], "immediate": [{"name": "local_index", "type": "varuint32"}], "description": "read a local variable or parameter" }, > "set_local": { "category": "special", "value": 33, "return": [], "parameter": ["any"], "immediate": [{"name": "local_index", "type": "varuint32"}], "description": "write a local variable or parameter" }, > "tee_local": { "category": "special", "value": 34, "return": ["any"], "parameter": ["any"], "immediate": [{"name": "local_index", "type": "varuint32"}], "description": "write a local variable or parameter and return the same value" }, >diff --git a/JSTests/ChangeLog b/JSTests/ChangeLog >index 2c83cfcdff0bba9790ae006615a2f673a717ba1f..a1360651e2cb164beb9d9b7ee360091ff4c5c3f5 100644 >--- a/JSTests/ChangeLog >+++ b/JSTests/ChangeLog >@@ -1,3 +1,23 @@ >+2019-05-16 Justin Michaud <justin_michaud@apple.com> >+ >+ [WASM-References] Add support for Anyref in parameters and return types, Ref.null and Ref.is_null for Anyref values. >+ https://bugs.webkit.org/show_bug.cgi?id=197969 >+ >+ Support the anyref type in Builder.js, plus add some extra error logging. >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * wasm/Builder.js: >+ (const._isValidValue): >+ * wasm/references/anyref_modules.js: Added. >+ (Call.3.RefIsNull.End.End.WebAssembly.js.ident): >+ (Call.3.RefIsNull.End.End.WebAssembly.js.make_null): >+ (Call.3.RefIsNull.End.End.WebAssembly): >+ * wasm/references/is_null.js: Added. >+ * wasm/references/is_null_error.js: Added. >+ * wasm/spec-harness/index.js: >+ * wasm/wasm.json: >+ > 2019-05-10 Saam barati <sbarati@apple.com> > > Call to JSToWasmICCallee::createStructure passes in wrong prototype value >diff --git a/JSTests/wasm/Builder.js b/JSTests/wasm/Builder.js >index e94f0a31a416f8631793551dc11603de6dc4d13c..f22de1b81c8409da044bb05112a45cd29fd72896 100644 >--- a/JSTests/wasm/Builder.js >+++ b/JSTests/wasm/Builder.js >@@ -33,6 +33,7 @@ const _isValidValue = (value, type) => { > switch (type) { > // We allow both signed and unsigned numbers. > case "i32": return Math.round(value) === value && LLB.varint32Min <= value && value <= LLB.varuint32Max; >+ case "anyref": return true; > case "i64": return true; // FIXME https://bugs.webkit.org/show_bug.cgi?id=163420 64-bit values > case "f32": return typeof(value) === "number" && isFinite(value); > case "f64": return typeof(value) === "number" && isFinite(value); >diff --git a/JSTests/wasm/references/anyref_modules.js b/JSTests/wasm/references/anyref_modules.js >new file mode 100644 >index 0000000000000000000000000000000000000000..1f05a60a7d7e14434115322b9a0da1eab89966cf >--- /dev/null >+++ b/JSTests/wasm/references/anyref_modules.js >@@ -0,0 +1,116 @@ >+import * as assert from '../assert.js'; >+import Builder from '../Builder.js'; >+ >+const $1 = new WebAssembly.Instance(new WebAssembly.Module((new Builder()) >+ .Type().End() >+ .Function().End() >+ .Export() >+ .Function("h") >+ .Function("i") >+ .Function("j") >+ .Function("k") >+ .End() >+ .Code() >+ .Function("h", { params: ["anyref"], ret: "anyref" }) >+ .GetLocal(0) >+ .End() >+ >+ .Function("i", { params: [], ret: "anyref" }) >+ .RefNull() >+ .Call(0) >+ .End() >+ >+ .Function("j", { params: ["anyref"], ret: "i32" }) >+ .GetLocal(0) >+ .RefIsNull() >+ .End() >+ >+ .Function("k", { params: [], ret: "i32" }) >+ .RefNull() >+ .RefIsNull() >+ .End() >+ .End().WebAssembly().get())); >+ >+const $2 = new WebAssembly.Instance(new WebAssembly.Module((new Builder()) >+ .Type().End() >+ .Import() >+ .Function("m1", "h", { params: ["anyref"], ret: "anyref" }) >+ .Function("m1", "j", { params: ["anyref"], ret: "i32" }) >+ .Function("js", "ident", { params: ["anyref"], ret: "anyref" }) >+ .Function("js", "make_null", { params: [], ret: "anyref" }) >+ .End() >+ .Function().End() >+ .Export() >+ .Function("call_h") >+ .Function("call_j") >+ .Function("call_h_null") >+ .Function("call_j_null") >+ .Function("call_ident") >+ .Function("call_ident_null") >+ .Function("is_makenull_null") >+ .End() >+ .Code() >+ .Function("call_h", { params: ["anyref"], ret: "anyref" }) >+ .GetLocal(0) >+ .Call(0) >+ .End() >+ >+ .Function("call_j", { params: ["anyref"], ret: "i32" }) >+ .GetLocal(0) >+ .Call(1) >+ .End() >+ >+ .Function("call_h_null", { params: [], ret: "anyref" }) >+ .RefNull() >+ .Call(0) >+ .End() >+ >+ .Function("call_j_null", { params: [], ret: "i32" }) >+ .RefNull() >+ .Call(1) >+ .End() >+ >+ .Function("call_ident", { params: ["anyref"], ret: "anyref" }) >+ .GetLocal(0) >+ .Call(2) >+ .End() >+ >+ .Function("call_ident_null", { params: [], ret: "anyref" }) >+ .RefNull() >+ .Call(2) >+ .End() >+ >+ .Function("is_makenull_null", { params: [], ret: "i32" }) >+ .Call(3) >+ .RefIsNull() >+ .End() >+ .End().WebAssembly().get()), { m1: $1.exports, js: { >+ ident: function(x) { return x; }, >+ make_null: function() { return null; }, >+ } }); >+ >+assert.eq($2.exports.call_h(null), null) >+ >+const obj = { test: "hi" } >+assert.eq($2.exports.call_h(obj), obj) >+assert.eq($2.exports.call_h(5), 5) >+assert.eq($2.exports.call_h("hi"), "hi") >+assert.eq($2.exports.call_h(undefined), undefined) >+ >+assert.eq($2.exports.call_j(obj), 0) >+assert.eq($2.exports.call_j(5), 0) >+assert.eq($2.exports.call_j("hi"), 0) >+assert.eq($2.exports.call_j(null), 1) >+assert.eq($2.exports.call_j(undefined), 0) >+ >+assert.eq($2.exports.call_h_null(), null) >+assert.eq($2.exports.call_j_null(), 1) >+ >+assert.eq($2.exports.call_ident(null), null) >+assert.eq($2.exports.call_ident(obj), obj) >+assert.eq($2.exports.call_ident(5), 5) >+assert.eq($2.exports.call_ident("hi"), "hi") >+assert.eq($2.exports.call_ident(undefined), undefined) >+ >+assert.eq($2.exports.call_ident_null(), null) >+assert.eq($2.exports.is_makenull_null(), 1) >diff --git a/JSTests/wasm/references/is_null.js b/JSTests/wasm/references/is_null.js >new file mode 100644 >index 0000000000000000000000000000000000000000..833a5fb7e6c1651c319d69d0243d4d5038bde4e3 >--- /dev/null >+++ b/JSTests/wasm/references/is_null.js >@@ -0,0 +1,58 @@ >+import * as assert from '../assert.js'; >+import Builder from '../Builder.js'; >+ >+const builder = (new Builder()) >+ .Type().End() >+ .Function().End() >+ .Export() >+ .Function("h") >+ .Function("i") >+ .Function("j") >+ .Function("k") >+ .End() >+ .Code() >+ .Function("h", { params: ["anyref"], ret: "anyref" }) >+ .GetLocal(0) >+ .End() >+ >+ .Function("i", { params: [], ret: "anyref" }) >+ .RefNull() >+ .Call(0) >+ .End() >+ >+ .Function("j", { params: ["anyref"], ret: "i32" }) >+ .GetLocal(0) >+ .RefIsNull() >+ .End() >+ >+ .Function("k", { params: [], ret: "i32" }) >+ .RefNull() >+ .RefIsNull() >+ .End() >+ .End(); >+ >+const bin = builder.WebAssembly().get(); >+const module = new WebAssembly.Module(bin); >+const instance = new WebAssembly.Instance(module); >+assert.eq(instance.exports.h(null), null) >+ >+const obj = { test: "hi" } >+assert.eq(instance.exports.h(obj), obj) >+assert.eq(instance.exports.h(5), 5) >+assert.eq(instance.exports.h("hi"), "hi") >+assert.eq(instance.exports.h(undefined), undefined) >+ >+assert.eq(instance.exports.i(), null) >+ >+assert.eq(instance.exports.j(obj), 0) >+assert.eq(instance.exports.j(5), 0) >+assert.eq(instance.exports.j("hi"), 0) >+assert.eq(instance.exports.j(null), 1) >+assert.eq(instance.exports.j(undefined), 0) >+ >+assert.eq(instance.exports.k(), 1) >+ >+assert.eq(obj.test, "hi") >+const obj2 = instance.exports.h(obj) >+obj2.test = "bye" >+assert.eq(obj.test, "bye") >diff --git a/JSTests/wasm/references/is_null_error.js b/JSTests/wasm/references/is_null_error.js >new file mode 100644 >index 0000000000000000000000000000000000000000..915b36ad99614f0f0f5b87c94235724d16955c8b >--- /dev/null >+++ b/JSTests/wasm/references/is_null_error.js >@@ -0,0 +1,22 @@ >+import * as assert from '../assert.js'; >+import Builder from '../Builder.js'; >+ >+{ >+ const builder = (new Builder()) >+ .Type().End() >+ .Function().End() >+ .Export() >+ .Function("j") >+ .End() >+ .Code() >+ .Function("j", { params: [], ret: "i32" }) >+ .I32Const(0) >+ .RefIsNull() >+ .End() >+ .End(); >+ >+ const bin = builder.WebAssembly(); >+ bin.trim(); >+ >+ assert.throws(() => new WebAssembly.Module(bin.get()), WebAssembly.CompileError, "WebAssembly.Module doesn't validate: ref.is_null to type I32 expected Anyref, in function at index 0 (evaluating 'new WebAssembly.Module(bin.get())')"); >+} >diff --git a/JSTests/wasm/spec-harness/index.js b/JSTests/wasm/spec-harness/index.js >index bc298d200a07b1d569708adf80e04b3ab96a14cc..eb00c6d878fc90d511f606b4b434845686735ae4 100644 >--- a/JSTests/wasm/spec-harness/index.js >+++ b/JSTests/wasm/spec-harness/index.js >@@ -190,6 +190,7 @@ function instance(bytes, imports = registry, valid = true) { > if (valid) { > uniqueTest(() => { > let instantiated = err === null; >+ if (!instantiated) print(err); > assert_true(instantiated, err); > }, "module successfully instantiated"); > } >diff --git a/JSTests/wasm/wasm.json b/JSTests/wasm/wasm.json >index 31d103f9c8a2022a7144032686e760c40caf3a45..e61aa74c338660e4b5f16a354d52d151060092b0 100644 >--- a/JSTests/wasm/wasm.json >+++ b/JSTests/wasm/wasm.json >@@ -12,11 +12,12 @@ > "f32": { "type": "varint7", "value": -3, "b3type": "B3::Float" }, > "f64": { "type": "varint7", "value": -4, "b3type": "B3::Double" }, > "anyfunc": { "type": "varint7", "value": -16, "b3type": "B3::Void" }, >+ "anyref": { "type": "varint7", "value": -17, "b3type": "B3::Int64" }, > "func": { "type": "varint7", "value": -32, "b3type": "B3::Void" }, > "void": { "type": "varint7", "value": -64, "b3type": "B3::Void" } > }, >- "value_type": ["i32", "i64", "f32", "f64"], >- "block_type": ["i32", "i64", "f32", "f64", "void"], >+ "value_type": ["i32", "i64", "f32", "f64", "anyref"], >+ "block_type": ["i32", "i64", "f32", "f64", "void", "anyref"], > "elem_type": ["anyfunc"], > "external_kind": { > "Function": { "type": "uint8", "value": 0 }, >@@ -58,6 +59,8 @@ > "i64.const": { "category": "special", "value": 66, "return": ["i64"], "parameter": [], "immediate": [{"name": "value", "type": "varint64"}], "description": "a constant value interpreted as i64" }, > "f64.const": { "category": "special", "value": 68, "return": ["f64"], "parameter": [], "immediate": [{"name": "value", "type": "double"}], "description": "a constant value interpreted as f64" }, > "f32.const": { "category": "special", "value": 67, "return": ["f32"], "parameter": [], "immediate": [{"name": "value", "type": "float"}], "description": "a constant value interpreted as f32" }, >+ "ref.null": { "category": "special", "value": 208, "return": ["anyref"], "parameter": [], "immediate": [], "description": "a constant null reference" }, >+ "ref.is_null": { "category": "special", "value": 209, "return": ["i32"], "parameter": ["anyref"], "immediate": [], "description": "determine if a reference is null" }, > "get_local": { "category": "special", "value": 32, "return": ["any"], "parameter": [], "immediate": [{"name": "local_index", "type": "varuint32"}], "description": "read a local variable or parameter" }, > "set_local": { "category": "special", "value": 33, "return": [], "parameter": ["any"], "immediate": [{"name": "local_index", "type": "varuint32"}], "description": "write a local variable or parameter" }, > "tee_local": { "category": "special", "value": 34, "return": ["any"], "parameter": ["any"], "immediate": [{"name": "local_index", "type": "varuint32"}], "description": "write a local variable or parameter and return the same value" },
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=370091">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 197969
:
370091
|
370157
|
370159