Add support for structured cloning of ErrorInstance objects #14296
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cdumez
added
the
DOM
|
EWS run on previous version of this PR (hash 8727198) |
webkit-ews-buildbot
added
the
merging-blocked
cdumez
force-pushed
the
257268_ErrorInstance_structured_clone
branch
from
8727198
to
9c7f8f5
Compare
|
EWS run on previous version of this PR (hash 9c7f8f5) |
webkit-ews-buildbot
added
the
merging-blocked
cdumez
force-pushed
the
257268_ErrorInstance_structured_clone
branch
from
9c7f8f5
to
b626b87
Compare
|
EWS run on previous version of this PR (hash b626b87) |
cdumez
force-pushed
the
257268_ErrorInstance_structured_clone
branch
from
b626b87
to
73823ed
Compare
|
EWS run on previous version of this PR (hash 73823ed) |
webkit-ews-buildbot
added
the
merging-blocked
cdumez
force-pushed
the
257268_ErrorInstance_structured_clone
branch
from
73823ed
to
a22af47
Compare
|
EWS run on previous version of this PR (hash a22af47) |
webkit-ews-buildbot
added
the
merging-blocked
cdumez
force-pushed
the
257268_ErrorInstance_structured_clone
branch
from
a22af47
to
44107e9
Compare
|
EWS run on previous version of this PR (hash 44107e9) |
rniwa
approved these changes
May 25, 2023
cdumez
commented
May 25, 2023
| PASS TypeError objects can be cloned | ||
| PASS URIError objects can be cloned | ||
| PASS URIError objects from other realms are treated as URIError | ||
| FAIL Cloning a modified Error assert_equals: Checking prototype expected object "TypeError" but got object "URIError" |
There was a problem hiding this comment.
Fixing the issues that Yusuke mentioned fixes this subtest. Will reupload a newer version shortly.
cdumez
force-pushed
the
257268_ErrorInstance_structured_clone
branch
2 times, most recently
from
65e5923
to
6722405
Compare
|
EWS run on previous version of this PR (hash 65e5923) |
|
EWS run on previous version of this PR (hash 6722405) |
Comment on lines
1439
to
1451
| auto errorTypeString = errorInstance->get(m_lexicalGlobalObject, vm.propertyNames->name).toWTFString(m_lexicalGlobalObject); | ||
| RETURN_IF_EXCEPTION(scope, false); |
There was a problem hiding this comment.
Let's error check twice. get can throw error, and can return JSEmpty. And toWTFString onto JSEmpty will crash. So,
auto errorTypeValue = errorInstance->get(m_lexicalGlobalObject, vm.propertyNames->name);
RETURN_IF_EXCEPTION(scope, false);
auto errorTypeString = errorTypeValue.toWTFString(m_lexicalGlobalObject);
RETURN_IF_EXCEPTION(scope, false);
|
|
||
| String message; | ||
| PropertyDescriptor messageDescriptor; | ||
| if (errorInstance->getOwnPropertyDescriptor(m_lexicalGlobalObject, vm.propertyNames->message, messageDescriptor) && messageDescriptor.isDataDescriptor()) |
There was a problem hiding this comment.
Let's do error check after getOwnPropertyDescriptor.
There was a problem hiding this comment.
This code looks correct to me?
If getOwnPropertyDescriptor() threw an exception, it would return false and I already have an exception check after the if case.
|
|
||
| unsigned line = 0; | ||
| PropertyDescriptor lineDescriptor; | ||
| if (errorInstance->getOwnPropertyDescriptor(m_lexicalGlobalObject, vm.propertyNames->line, lineDescriptor) && lineDescriptor.isDataDescriptor()) |
|
|
||
| unsigned column = 0; | ||
| PropertyDescriptor columnDescriptor; | ||
| if (errorInstance->getOwnPropertyDescriptor(m_lexicalGlobalObject, vm.propertyNames->column, columnDescriptor) && columnDescriptor.isDataDescriptor()) |
|
|
||
| String sourceURL; | ||
| PropertyDescriptor sourceURLDescriptor; | ||
| if (errorInstance->getOwnPropertyDescriptor(m_lexicalGlobalObject, vm.propertyNames->sourceURL, sourceURLDescriptor) && sourceURLDescriptor.isDataDescriptor()) |
| unsigned line = 0; | ||
| PropertyDescriptor lineDescriptor; | ||
| if (errorInstance->getOwnPropertyDescriptor(m_lexicalGlobalObject, vm.propertyNames->line, lineDescriptor) && lineDescriptor.isDataDescriptor()) | ||
| line = lineDescriptor.value().toNumber(m_lexicalGlobalObject); |
There was a problem hiding this comment.
Ditto. toNumber requires error check. (Object can be returned, and it can have valueOf method).
| unsigned column = 0; | ||
| PropertyDescriptor columnDescriptor; | ||
| if (errorInstance->getOwnPropertyDescriptor(m_lexicalGlobalObject, vm.propertyNames->column, columnDescriptor) && columnDescriptor.isDataDescriptor()) | ||
| column = columnDescriptor.value().toNumber(m_lexicalGlobalObject); |
| String stack; | ||
| PropertyDescriptor stackDescriptor; | ||
| if (errorInstance->getOwnPropertyDescriptor(m_lexicalGlobalObject, vm.propertyNames->stack, stackDescriptor) && stackDescriptor.isDataDescriptor()) | ||
| stack = stackDescriptor.value().toWTFString(m_lexicalGlobalObject); |
Comment on lines
264
to
276
| if (equalLettersIgnoringASCIICase(name, "evalerror"_s)) | ||
| return ErrorType::EvalError; | ||
| if (equalLettersIgnoringASCIICase(name, "rangeerror"_s)) | ||
| return ErrorType::RangeError; | ||
| if (equalLettersIgnoringASCIICase(name, "referenceerror"_s)) | ||
| return ErrorType::ReferenceError; | ||
| if (equalLettersIgnoringASCIICase(name, "syntaxerror"_s)) | ||
| return ErrorType::SyntaxError; | ||
| if (equalLettersIgnoringASCIICase(name, "typeerror"_s)) | ||
| return ErrorType::TypeError; | ||
| if (equalLettersIgnoringASCIICase(name, "urierror"_s)) | ||
| return ErrorType::URIError; | ||
| return ErrorType::Error; |
There was a problem hiding this comment.
We should define these enums separately in this SerializedScriptValue. ErrorType enum is not a defined interface in JSC. So this can be changed freely, and it can break serialization since it is relying on this errorType number serialized in persistent storage.
Comment on lines
281
to
297
| switch (value) { | ||
| case enumToUnderlyingType(ErrorType::Error): | ||
| return ErrorType::Error; | ||
| case enumToUnderlyingType(ErrorType::EvalError): | ||
| return ErrorType::EvalError; | ||
| case enumToUnderlyingType(ErrorType::RangeError): | ||
| return ErrorType::RangeError; | ||
| case enumToUnderlyingType(ErrorType::ReferenceError): | ||
| return ErrorType::ReferenceError; | ||
| case enumToUnderlyingType(ErrorType::SyntaxError): | ||
| return ErrorType::SyntaxError; | ||
| case enumToUnderlyingType(ErrorType::TypeError): | ||
| return ErrorType::TypeError; | ||
| case enumToUnderlyingType(ErrorType::URIError): | ||
| return ErrorType::URIError; | ||
| default: | ||
| break; |
There was a problem hiding this comment.
And we should get JSC's ErrorType from defined enum here.
cdumez
force-pushed
the
257268_ErrorInstance_structured_clone
branch
from
6722405
to
cbf266e
Compare
|
EWS run on current version of this PR (hash cbf266e) |
https://bugs.webkit.org/show_bug.cgi?id=257268 Reviewed by Yusuke Suzuki and Ryosuke Niwa. Add support for structured cloning of ErrorInstance objects, per: - https://html.spec.whatwg.org/multipage/structured-data.html#structuredserializeinternal This aligns our behavior with Blink and Gecko. * LayoutTests/fast/dom/Window/window-postmessage-clone-expected.txt: * LayoutTests/fast/dom/Window/window-postmessage-clone.html: * LayoutTests/fast/events/message-port-multi-expected.txt: * LayoutTests/fast/events/resources/message-port-multi.js: * LayoutTests/fast/storage/serialized-script-value.html: * LayoutTests/imported/w3c/web-platform-tests/IndexedDB/structured-clone.any.worker_81-100-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/IndexedDB/structured-clone.any_81-100-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/messagechannel.any-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/messagechannel.any.serviceworker-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/messagechannel.any.sharedworker-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/messagechannel.any.worker-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/structured-cloning-error-stack-optional.sub.window-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/structuredclone_0-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/window-postmessage.window-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/workers/semantics/structured-clone/dedicated-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/workers/semantics/structured-clone/shared-expected.txt: * LayoutTests/storage/indexeddb/resources/structured-clone.js: * LayoutTests/storage/indexeddb/structured-clone-expected.txt: * LayoutTests/userscripts/window-onerror-for-isolated-world-1-expected.txt: * LayoutTests/userscripts/window-onerror-for-isolated-world-2-expected.txt: * Source/JavaScriptCore/runtime/ErrorInstance.cpp: (JSC::ErrorInstance::finishCreation): * Source/JavaScriptCore/runtime/ErrorInstance.h: (JSC::ErrorInstance::createWithoutStackTrace): * Source/WebCore/bindings/js/SerializedScriptValue.cpp: (WebCore::CloneSerializer::dumpIfTerminal): (WebCore::CloneDeserializer::readTerminal): Canonical link: https://commits.webkit.org/264552@main
webkit-commit-queue
force-pushed
the
257268_ErrorInstance_structured_clone
branch
from
cbf266e
to
7bd6b87
Compare
|
Committed 264552@main (7bd6b87): https://commits.webkit.org/264552@main Reviewed commits have been landed. Closing PR #14296 and removing active labels. |
webkit-commit-queue
removed
the
merge-queue
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
7bd6b87
cbf266e
🧪 api-mac