<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[213452] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/213452">213452</a></dd>
<dt>Author</dt> <dd>utatane.tea@gmail.com</dd>
<dt>Date</dt> <dd>2017-03-06 08:57:11 -0800 (Mon, 06 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Null pointer crash when loading module with unresolved import also as a script file
https://bugs.webkit.org/show_bug.cgi?id=168971
Reviewed by Saam Barati.
JSTests:
* stress/re-execute-error-module.js: Added.
(shouldBe):
(async):
* stress/resources/error-module.js: Added.
Source/JavaScriptCore:
If linking throws an error, this error should be re-thrown
when requesting the same module.
* builtins/ModuleLoaderPrototype.js:
(globalPrivate.newRegistryEntry):
* runtime/JSModuleRecord.cpp:
(JSC::JSModuleRecord::link):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJSTestsChangeLog">trunk/JSTests/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebuiltinsModuleLoaderPrototypejs">trunk/Source/JavaScriptCore/builtins/ModuleLoaderPrototype.js</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSModuleRecordcpp">trunk/Source/JavaScriptCore/runtime/JSModuleRecord.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkJSTestsstressreexecuteerrormodulejs">trunk/JSTests/stress/re-execute-error-module.js</a></li>
<li><a href="#trunkJSTestsstressresourceserrormodulejs">trunk/JSTests/stress/resources/error-module.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (213451 => 213452)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog 2017-03-06 16:02:51 UTC (rev 213451)
+++ trunk/JSTests/ChangeLog 2017-03-06 16:57:11 UTC (rev 213452)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2017-03-06 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ Null pointer crash when loading module with unresolved import also as a script file
+ https://bugs.webkit.org/show_bug.cgi?id=168971
+
+ Reviewed by Saam Barati.
+
+ * stress/re-execute-error-module.js: Added.
+ (shouldBe):
+ (async):
+ * stress/resources/error-module.js: Added.
+
</ins><span class="cx"> 2017-03-02 Keith Miller <keith_miller@apple.com>
</span><span class="cx">
</span><span class="cx"> WebAssemblyFunction should have Function.prototype as its prototype
</span></span></pre></div>
<a id="trunkJSTestsstressreexecuteerrormodulejs"></a>
<div class="addfile"><h4>Added: trunk/JSTests/stress/re-execute-error-module.js (0 => 213452)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/stress/re-execute-error-module.js (rev 0)
+++ trunk/JSTests/stress/re-execute-error-module.js 2017-03-06 16:57:11 UTC (rev 213452)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+function shouldBe(actual, expected)
+{
+ if (actual !== expected)
+ throw new Error(`bad value: ${String(actual)}`);
+}
+
+(async function () {
+ {
+ let errorMessage = null;
+ try {
+ await import("./resources/error-module.js");
+ } catch (error) {
+ errorMessage = String(error);
+ }
+ shouldBe(errorMessage, `SyntaxError: Importing binding name 'x' is not found.`);
+ }
+ {
+ let errorMessage = null;
+ try {
+ await import("./resources/error-module.js");
+ } catch (error) {
+ errorMessage = String(error);
+ }
+ shouldBe(errorMessage, `SyntaxError: Importing binding name 'x' is not found.`);
+ }
+}()).catch(abort);
</ins></span></pre></div>
<a id="trunkJSTestsstressresourceserrormodulejs"></a>
<div class="addfile"><h4>Added: trunk/JSTests/stress/resources/error-module.js (0 => 213452)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/stress/resources/error-module.js (rev 0)
+++ trunk/JSTests/stress/resources/error-module.js 2017-03-06 16:57:11 UTC (rev 213452)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+import {x} from "./error-module.js"
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (213451 => 213452)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2017-03-06 16:02:51 UTC (rev 213451)
+++ trunk/Source/JavaScriptCore/ChangeLog 2017-03-06 16:57:11 UTC (rev 213452)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2017-03-06 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><ins>+ Null pointer crash when loading module with unresolved import also as a script file
+ https://bugs.webkit.org/show_bug.cgi?id=168971
+
+ Reviewed by Saam Barati.
+
+ If linking throws an error, this error should be re-thrown
+ when requesting the same module.
+
+ * builtins/ModuleLoaderPrototype.js:
+ (globalPrivate.newRegistryEntry):
+ * runtime/JSModuleRecord.cpp:
+ (JSC::JSModuleRecord::link):
+
+2017-03-06 Yusuke Suzuki <utatane.tea@gmail.com>
+
</ins><span class="cx"> [GTK][JSCOnly] Enable WebAssembly on Linux environment
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=164032
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebuiltinsModuleLoaderPrototypejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/builtins/ModuleLoaderPrototype.js (213451 => 213452)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/builtins/ModuleLoaderPrototype.js 2017-03-06 16:02:51 UTC (rev 213451)
+++ trunk/Source/JavaScriptCore/builtins/ModuleLoaderPrototype.js 2017-03-06 16:57:11 UTC (rev 213452)
</span><span class="lines">@@ -92,7 +92,6 @@
</span><span class="cx"> return {
</span><span class="cx"> key: key,
</span><span class="cx"> state: @ModuleFetch,
</span><del>- metadata: @undefined,
</del><span class="cx"> fetch: @undefined,
</span><span class="cx"> instantiate: @undefined,
</span><span class="cx"> satisfy: @undefined,
</span><span class="lines">@@ -99,7 +98,8 @@
</span><span class="cx"> dependencies: [], // To keep the module order, we store the module keys in the array.
</span><span class="cx"> dependenciesMap: @undefined,
</span><span class="cx"> module: @undefined, // JSModuleRecord
</span><del>- error: @undefined,
</del><ins>+ linkError: @undefined,
+ linkSucceeded: true,
</ins><span class="cx"> };
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -350,24 +350,28 @@
</span><span class="cx">
</span><span class="cx"> "use strict";
</span><span class="cx">
</span><del>- // FIXME: Current implementation does not support optionalInstance.
- // So Link's step 3 is skipped.
- // https://bugs.webkit.org/show_bug.cgi?id=148171
-
</del><ins>+ if (!entry.linkSucceeded)
+ throw entry.linkError;
</ins><span class="cx"> if (entry.state === @ModuleReady)
</span><span class="cx"> return;
</span><span class="cx"> @setStateToMax(entry, @ModuleReady);
</span><span class="cx">
</span><del>- // Since we already have the "dependencies" field,
- // we can call moduleDeclarationInstantiation with the correct order
- // without constructing the dependency graph by calling dependencyGraph.
- var dependencies = entry.dependencies;
- for (var i = 0, length = dependencies.length; i < length; ++i) {
- var pair = dependencies[i];
- this.link(pair.value.registryEntry, fetcher);
</del><ins>+ try {
+ // Since we already have the "dependencies" field,
+ // we can call moduleDeclarationInstantiation with the correct order
+ // without constructing the dependency graph by calling dependencyGraph.
+ var dependencies = entry.dependencies;
+ for (var i = 0, length = dependencies.length; i < length; ++i) {
+ var pair = dependencies[i];
+ this.link(pair.value.registryEntry, fetcher);
+ }
+
+ this.moduleDeclarationInstantiation(entry.module, fetcher);
+ } catch (error) {
+ entry.linkSucceeded = false;
+ entry.linkError = error;
+ throw error;
</ins><span class="cx"> }
</span><del>-
- this.moduleDeclarationInstantiation(entry.module, fetcher);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Module semantics.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSModuleRecordcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSModuleRecord.cpp (213451 => 213452)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSModuleRecord.cpp 2017-03-06 16:02:51 UTC (rev 213451)
+++ trunk/Source/JavaScriptCore/runtime/JSModuleRecord.cpp 2017-03-06 16:57:11 UTC (rev 213452)
</span><span class="lines">@@ -86,8 +86,9 @@
</span><span class="cx"> throwSyntaxError(exec, scope);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><ins>+ instantiateDeclarations(exec, executable);
+ RETURN_IF_EXCEPTION(scope, void());
</ins><span class="cx"> m_moduleProgramExecutable.set(vm, this, executable);
</span><del>- instantiateDeclarations(exec, executable);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JSModuleRecord::instantiateDeclarations(ExecState* exec, ModuleProgramExecutable* moduleProgramExecutable)
</span></span></pre>
</div>
</div>
</body>
</html>