Diff
Modified: trunk/LayoutTests/imported/w3c/ChangeLog (288988 => 288989)
--- trunk/LayoutTests/imported/w3c/ChangeLog 2022-02-02 20:49:53 UTC (rev 288988)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2022-02-02 20:51:51 UTC (rev 288989)
@@ -1,3 +1,22 @@
+2022-02-02 Asumu Takikawa <[email protected]>
+
+ Unmute link errors for ES module scripts
+ https://bugs.webkit.org/show_bug.cgi?id=235925
+
+ Reviewed by Yusuke Suzuki.
+
+ Adjust test expectations for error handling changes.
+
+ * web-platform-tests/html/semantics/scripting-1/the-script-element/module/choice-of-error-2-expected.txt:
+ * web-platform-tests/html/semantics/scripting-1/the-script-element/module/error-type-3-expected.txt:
+ * web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-1-expected.txt:
+ * web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-2-expected.txt:
+ * web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-3-expected.txt:
+ * web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-4-expected.txt:
+ * web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-5-expected.txt:
+ * web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-6-expected.txt:
+ * web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-7-expected.txt:
+
2022-02-02 Patrick Griffis <[email protected]>
WPT: Import WebAssembly CSP tests
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/choice-of-error-2-expected.txt (288988 => 288989)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/choice-of-error-2-expected.txt 2022-02-02 20:49:53 UTC (rev 288988)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/choice-of-error-2-expected.txt 2022-02-02 20:51:51 UTC (rev 288989)
@@ -1,5 +1,5 @@
CONSOLE MESSAGE: SyntaxError: Importing binding name 'default' cannot be resolved by star export entries.
CONSOLE MESSAGE: SyntaxError: Importing binding name 'default' cannot be resolved by star export entries.
-FAIL Instantiation errors in different files should be reported depending on different roots null is not an object (evaluating 'log[0].constructor')
+FAIL Instantiation errors in different files should be reported depending on different roots assert_not_equals: two different instantiation errors should be reported got disallowed value object "SyntaxError: Importing binding name 'default' cannot be resolved by star export entries."
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/error-type-3-expected.txt (288988 => 288989)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/error-type-3-expected.txt 2022-02-02 20:49:53 UTC (rev 288988)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/error-type-3-expected.txt 2022-02-02 20:51:51 UTC (rev 288989)
@@ -1,5 +1,5 @@
CONSOLE MESSAGE: [object Object]
CONSOLE MESSAGE: SyntaxError: Importing binding name 'default' cannot be resolved by star export entries.
-FAIL instantiation error has higher priority than evaluation error null is not an object (evaluating 'log[3].constructor')
+PASS instantiation error has higher priority than evaluation error
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-1-expected.txt (288988 => 288989)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-1-expected.txt 2022-02-02 20:49:53 UTC (rev 288988)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-1-expected.txt 2022-02-02 20:51:51 UTC (rev 288989)
@@ -4,5 +4,5 @@
CONSOLE MESSAGE: SyntaxError: Importing binding name 'default' cannot be resolved by star export entries.
CONSOLE MESSAGE: SyntaxError: Importing binding name 'default' cannot be resolved by star export entries.
-FAIL Test that missing exports lead to SyntaxError events on window and load events on script null is not an object (evaluating 'ev.error.constructor')
+PASS Test that missing exports lead to SyntaxError events on window and load events on script
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-2-expected.txt (288988 => 288989)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-2-expected.txt 2022-02-02 20:49:53 UTC (rev 288988)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-2-expected.txt 2022-02-02 20:51:51 UTC (rev 288989)
@@ -4,5 +4,5 @@
CONSOLE MESSAGE: SyntaxError: Importing binding name 'default' cannot be resolved by star export entries.
CONSOLE MESSAGE: SyntaxError: Importing binding name 'default' cannot be resolved by star export entries.
-FAIL Test that missing exports lead to SyntaxError events on window and load events on script null is not an object (evaluating 'ev.error.constructor')
+PASS Test that missing exports lead to SyntaxError events on window and load events on script
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-3-expected.txt (288988 => 288989)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-3-expected.txt 2022-02-02 20:49:53 UTC (rev 288988)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-3-expected.txt 2022-02-02 20:51:51 UTC (rev 288989)
@@ -2,5 +2,5 @@
CONSOLE MESSAGE: SyntaxError: Indirectly exported binding name 'x' is not found.
CONSOLE MESSAGE: SyntaxError: Indirectly exported binding name 'x' is not found.
-FAIL Test that unresolvable cycles lead to SyntaxError events on window and load events on script null is not an object (evaluating 'ev.error.constructor')
+FAIL Test that unresolvable cycles lead to SyntaxError events on window and load events on script assert_not_equals: Instantiation error objects for different root scripts got disallowed value "SyntaxError: Indirectly exported binding name 'x' is not found."
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-4-expected.txt (288988 => 288989)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-4-expected.txt 2022-02-02 20:49:53 UTC (rev 288988)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-4-expected.txt 2022-02-02 20:51:51 UTC (rev 288989)
@@ -1,5 +1,5 @@
CONSOLE MESSAGE: SyntaxError: Importing binding name 'something' is not found.
CONSOLE MESSAGE: SyntaxError: Importing binding name 'something' is not found.
-FAIL Test that loading a graph in which a module is already errored results in an error. null is not an object (evaluating 'ev.error.constructor')
+FAIL Test that loading a graph in which a module is already errored results in an error. assert_not_equals: Instantiation error objects for different root scripts got disallowed value "SyntaxError: Importing binding name 'something' is not found."
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-5-expected.txt (288988 => 288989)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-5-expected.txt 2022-02-02 20:49:53 UTC (rev 288988)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-5-expected.txt 2022-02-02 20:51:51 UTC (rev 288989)
@@ -1,5 +1,5 @@
CONSOLE MESSAGE: SyntaxError: Importing binding name 'something' is not found.
CONSOLE MESSAGE: SyntaxError: Importing binding name 'something' is not found.
-FAIL Test that loading a graph in which a module is already errored results an error. null is not an object (evaluating 'ev.error.constructor')
+FAIL Test that loading a graph in which a module is already errored results an error. assert_not_equals: Instantiation error objects for different root scripts got disallowed value "SyntaxError: Importing binding name 'something' is not found."
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-6-expected.txt (288988 => 288989)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-6-expected.txt 2022-02-02 20:49:53 UTC (rev 288988)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-6-expected.txt 2022-02-02 20:51:51 UTC (rev 288989)
@@ -1,4 +1,4 @@
CONSOLE MESSAGE: SyntaxError: Importing binding name 'foo' cannot be resolved due to ambiguous multiple bindings.
-FAIL Test that ambiguous star exports lead to an instantiation error and that the correct module is blamed. null is not an object (evaluating 'exn.constructor')
+PASS Test that ambiguous star exports lead to an instantiation error and that the correct module is blamed.
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-7-expected.txt (288988 => 288989)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-7-expected.txt 2022-02-02 20:49:53 UTC (rev 288988)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-7-expected.txt 2022-02-02 20:51:51 UTC (rev 288989)
@@ -1,4 +1,4 @@
CONSOLE MESSAGE: SyntaxError: Importing binding name 'foo' cannot be resolved due to ambiguous multiple bindings.
-FAIL Test that ambiguous star exports lead to an instantiation error, even when discovered through a star export, and that the correct module is blamed. null is not an object (evaluating 'exn.constructor')
+PASS Test that ambiguous star exports lead to an instantiation error, even when discovered through a star export, and that the correct module is blamed.
Modified: trunk/Source/WebCore/ChangeLog (288988 => 288989)
--- trunk/Source/WebCore/ChangeLog 2022-02-02 20:49:53 UTC (rev 288988)
+++ trunk/Source/WebCore/ChangeLog 2022-02-02 20:51:51 UTC (rev 288989)
@@ -1,3 +1,13 @@
+2022-02-02 Asumu Takikawa <[email protected]>
+
+ Unmute link errors for ES module scripts
+ https://bugs.webkit.org/show_bug.cgi?id=235925
+
+ Reviewed by Yusuke Suzuki.
+
+ * bindings/js/ScriptController.cpp:
+ (WebCore::ScriptController::linkAndEvaluateModuleScriptInWorld):
+
2022-02-02 Pablo Saavedra <[email protected]>
Fixes for non-unified builds after r288868
Modified: trunk/Source/WebCore/bindings/js/ScriptController.cpp (288988 => 288989)
--- trunk/Source/WebCore/bindings/js/ScriptController.cpp 2022-02-02 20:49:53 UTC (rev 288988)
+++ trunk/Source/WebCore/bindings/js/ScriptController.cpp 2022-02-02 20:51:51 UTC (rev 288989)
@@ -212,7 +212,8 @@
if (evaluationException) {
// FIXME: Give a chance to dump the stack trace if the "crossorigin" attribute allows.
// https://bugs.webkit.org/show_bug.cgi?id=164539
- reportException(&lexicalGlobalObject, evaluationException, nullptr);
+ constexpr bool fromModule = true;
+ reportException(&lexicalGlobalObject, evaluationException, nullptr, fromModule);
return jsUndefined();
}
return returnValue;
