<!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>[205276] trunk/Source/JavaScriptCore</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/205276">205276</a></dd>
<dt>Author</dt> <dd>utatane.tea@gmail.com</dd>
<dt>Date</dt> <dd>2016-08-31 19:11:43 -0700 (Wed, 31 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[JSC] linking and evaluating the modules are done in a sync manner
https://bugs.webkit.org/show_bug.cgi?id=161467
Reviewed by Saam Barati.
While the fetching and the other stages are done in an asynchronous manner,
linking and evaluating are done in a sync manner.
Just return the result value and do not wrap them with the internal promise.
* builtins/ModuleLoaderPrototype.js:
(linkAndEvaluateModule):
* runtime/Completion.cpp:
(JSC::linkAndEvaluateModule):
* runtime/Completion.h:
* runtime/JSModuleLoader.cpp:
(JSC::JSModuleLoader::linkAndEvaluateModule):
* runtime/JSModuleLoader.h:</pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunkSourceJavaScriptCoreruntimeCompletioncpp">trunk/Source/JavaScriptCore/runtime/Completion.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeCompletionh">trunk/Source/JavaScriptCore/runtime/Completion.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSModuleLoadercpp">trunk/Source/JavaScriptCore/runtime/JSModuleLoader.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSModuleLoaderh">trunk/Source/JavaScriptCore/runtime/JSModuleLoader.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (205275 => 205276)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-09-01 01:33:40 UTC (rev 205275)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-09-01 02:11:43 UTC (rev 205276)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2016-08-31 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><ins>+ [JSC] linking and evaluating the modules are done in a sync manner
+ https://bugs.webkit.org/show_bug.cgi?id=161467
+
+ Reviewed by Saam Barati.
+
+ While the fetching and the other stages are done in an asynchronous manner,
+ linking and evaluating are done in a sync manner.
+ Just return the result value and do not wrap them with the internal promise.
+
+ * builtins/ModuleLoaderPrototype.js:
+ (linkAndEvaluateModule):
+ * runtime/Completion.cpp:
+ (JSC::linkAndEvaluateModule):
+ * runtime/Completion.h:
+ * runtime/JSModuleLoader.cpp:
+ (JSC::JSModuleLoader::linkAndEvaluateModule):
+ * runtime/JSModuleLoader.h:
+
+2016-08-31 Yusuke Suzuki <utatane.tea@gmail.com>
+
</ins><span class="cx"> stress/random-53bit.js.ftl-no-cjit-no-inline-validate sometimes fails
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=161436
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebuiltinsModuleLoaderPrototypejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/builtins/ModuleLoaderPrototype.js (205275 => 205276)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/builtins/ModuleLoaderPrototype.js 2016-09-01 01:33:40 UTC (rev 205275)
+++ trunk/Source/JavaScriptCore/builtins/ModuleLoaderPrototype.js 2016-09-01 02:11:43 UTC (rev 205276)
</span><span class="lines">@@ -558,5 +558,10 @@
</span><span class="cx"> {
</span><span class="cx"> "use strict";
</span><span class="cx">
</span><del>- return this.requestReady(key);
</del><ins>+ var entry = this.ensureRegistered(key);
+ if (entry.state < @ModuleLink)
+ throw new @TypeError("Requested module is not instantiated yet.");
+
+ this.link(entry);
+ return this.moduleEvaluation(entry.module);
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeCompletioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Completion.cpp (205275 => 205276)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Completion.cpp 2016-09-01 01:33:40 UTC (rev 205275)
+++ trunk/Source/JavaScriptCore/runtime/Completion.cpp 2016-09-01 02:11:43 UTC (rev 205276)
</span><span class="lines">@@ -229,7 +229,7 @@
</span><span class="cx"> return loadModule(lock, exec, globalObject, key, jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSInternalPromise* linkAndEvaluateModule(ExecState* exec, const Identifier& moduleKey)
</del><ins>+JSValue linkAndEvaluateModule(ExecState* exec, const Identifier& moduleKey)
</ins><span class="cx"> {
</span><span class="cx"> JSLockHolder lock(exec);
</span><span class="cx"> RELEASE_ASSERT(exec->vm().atomicStringTable() == wtfThreadData().atomicStringTable());
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeCompletionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Completion.h (205275 => 205276)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Completion.h 2016-09-01 01:33:40 UTC (rev 205275)
+++ trunk/Source/JavaScriptCore/runtime/Completion.h 2016-09-01 02:11:43 UTC (rev 205276)
</span><span class="lines">@@ -65,8 +65,8 @@
</span><span class="cx"> JS_EXPORT_PRIVATE JSInternalPromise* loadModule(ExecState*, const String& moduleName);
</span><span class="cx"> JS_EXPORT_PRIVATE JSInternalPromise* loadModule(ExecState*, const SourceCode&);
</span><span class="cx">
</span><del>-// Link and evaluate the already linked module.
-JS_EXPORT_PRIVATE JSInternalPromise* linkAndEvaluateModule(ExecState*, const Identifier& moduleKey);
</del><ins>+// Link and evaluate the already linked module. This function is called in a sync manner.
+JS_EXPORT_PRIVATE JSValue linkAndEvaluateModule(ExecState*, const Identifier& moduleKey);
</ins><span class="cx">
</span><span class="cx"> } // namespace JSC
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSModuleLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSModuleLoader.cpp (205275 => 205276)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSModuleLoader.cpp 2016-09-01 01:33:40 UTC (rev 205275)
+++ trunk/Source/JavaScriptCore/runtime/JSModuleLoader.cpp 2016-09-01 02:11:43 UTC (rev 205276)
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> return jsCast<JSInternalPromise*>(call(exec, function, callType, callData, this, arguments));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSInternalPromise* JSModuleLoader::linkAndEvaluateModule(ExecState* exec, JSValue moduleKey)
</del><ins>+JSValue JSModuleLoader::linkAndEvaluateModule(ExecState* exec, JSValue moduleKey)
</ins><span class="cx"> {
</span><span class="cx"> JSObject* function = jsCast<JSObject*>(get(exec, exec->propertyNames().builtinNames().linkAndEvaluateModulePublicName()));
</span><span class="cx"> CallData callData;
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx"> MarkedArgumentBuffer arguments;
</span><span class="cx"> arguments.append(moduleKey);
</span><span class="cx">
</span><del>- return jsCast<JSInternalPromise*>(call(exec, function, callType, callData, this, arguments));
</del><ins>+ return call(exec, function, callType, callData, this, arguments);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSInternalPromise* JSModuleLoader::resolve(ExecState* exec, JSValue name, JSValue referrer)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSModuleLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSModuleLoader.h (205275 => 205276)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSModuleLoader.h 2016-09-01 01:33:40 UTC (rev 205275)
+++ trunk/Source/JavaScriptCore/runtime/JSModuleLoader.h 2016-09-01 02:11:43 UTC (rev 205276)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> JSValue provide(ExecState*, JSValue key, Status, const String&);
</span><span class="cx"> JSInternalPromise* loadAndEvaluateModule(ExecState*, JSValue moduleName, JSValue referrer);
</span><span class="cx"> JSInternalPromise* loadModule(ExecState*, JSValue moduleName, JSValue referrer);
</span><del>- JSInternalPromise* linkAndEvaluateModule(ExecState*, JSValue moduleKey);
</del><ins>+ JSValue linkAndEvaluateModule(ExecState*, JSValue moduleKey);
</ins><span class="cx">
</span><span class="cx"> // Platform dependent hooked APIs.
</span><span class="cx"> JSInternalPromise* resolve(ExecState*, JSValue name, JSValue referrer);
</span></span></pre>
</div>
</div>
</body>
</html>