| Summary: | WebAssembly API: implement WebAssembly.LinkError | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Product: | WebKit | Reporter: | JF Bastien <jfbastien> | ||||||
| Component: | JavaScriptCore | Assignee: | JF Bastien <jfbastien> | ||||||
| Status: | RESOLVED FIXED | ||||||||
| Severity: | Normal | CC: | commit-queue, jfbastien, keith_miller, saam, webkit-bug-importer | ||||||
| Priority: | P2 | Keywords: | InRadar | ||||||
| Version: | WebKit Nightly Build | ||||||||
| Hardware: | Unspecified | ||||||||
| OS: | Unspecified | ||||||||
| Bug Depends on: | |||||||||
| Bug Blocks: | 159775, 166199, 166295 | ||||||||
| Attachments: |
|
||||||||
|
Description
JF Bastien
2016-12-13 10:01:59 PST
Created attachment 297510 [details]
patch
Most of this patch is boilerplate for a new JS object, copied as-is from the CompileError code and modified with sed.
I noted the interesting changes in the ChangeLog, but they're not that interesting either:
- Change error types thrown in instance construction and module linking.
- Update tests accordingly.
Overall, a good late-day patch: we need to do this, and it's brainless.
Comment on attachment 297510 [details] patch View in context: https://bugs.webkit.org/attachment.cgi?id=297510&action=review r=me with fixes. > Source/JavaScriptCore/wasm/js/JSWebAssemblyLinkError.cpp:55 > +JSObject* createWebAssemblyLinkError(ExecState* exec, const String& message) > +{ > + ASSERT(!message.isEmpty()); > + JSGlobalObject* globalObject = exec->lexicalGlobalObject(); > + return ErrorInstance::create(exec, globalObject->vm(), globalObject->WebAssemblyLinkErrorStructure(), message, defaultSourceAppender, TypeNothing, true); This is weird. The function name suggests that we're creating an WebAssemblyLinkError, but we're invoking the ErrorInstance factory instead of the JSWebAssemblyLinkError factory above. Am I missing something? Do we really need the JSWebAssemblyLinkError class? I think the error here is that you're constructing an instance of ErrorInstance instead of JSWebAssemblyLinkError. nit: I also recommend passing a VM& in as one of the arguments so that we don't have to recompute it. We already know the VM& at all call sites below (except fro one ... but I'll provide details on how to address that one below). > Source/JavaScriptCore/wasm/js/WebAssemblyLinkErrorConstructor.cpp:53 > + RETURN_IF_EXCEPTION(scope, { }); This is wrong (and also wrong in the other places). { } invokes the default constructor for int64_t which is not the same as the JSValue::encode(JSValue()). What you want here is: RETURN_IF_EXCEPTION(scope, encodedJSValue()); > Source/JavaScriptCore/wasm/js/WebAssemblyModuleRecord.cpp:201 > + return throwException(state, scope, createWebAssemblyLinkError(state, makeString(ASCIILiteral("Invalid data segment initialization: segment of "), String::number(segmentSize), ASCIILiteral(" bytes memory of "), String::number(memorySize), ASCIILiteral(" bytes, at offset "), String::number(offset), args...))); if you do change createWebAssemblyLinkError() to take a VM&, you can get VM& from scope.vm(). Created attachment 297542 [details]
patch
Address comments. I'll do follow-up patches to address similar issues (encoded value, error construction, VM) elsewhere in the wasm codebase. Thanks for pointing those out!
Comment on attachment 297542 [details] patch Clearing flags on attachment: 297542 Committed r210028: <http://trac.webkit.org/changeset/210028> All reviewed patches have been landed. Closing bug. |