<!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>[209848] 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/209848">209848</a></dd>
<dt>Author</dt> <dd>utatane.tea@gmail.com</dd>
<dt>Date</dt> <dd>2016-12-14 18:23:56 -0800 (Wed, 14 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update ModuleLoader code by using the latest builtin primitives
https://bugs.webkit.org/show_bug.cgi?id=165851
Reviewed by Sam Weinig.
Update the module loader code,
1. Use @globalPrivate for the utilities, instead of setting them as the member of ModuleLoader.
2. Use @putByValDirect instead of @push. @push is user-observable since it uses Set() operation
and it can be observed by defining indexed setters in Array.prototype.
* builtins/ModuleLoaderPrototype.js:
(ensureRegistered):
(fulfillFetch):
(commitInstantiated):
(requestFetch):
(requestSatisfy):
(setStateToMax): Deleted.
(newRegistryEntry): Deleted.
* runtime/ModuleLoaderPrototype.cpp:</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="#trunkSourceJavaScriptCoreruntimeModuleLoaderPrototypecpp">trunk/Source/JavaScriptCore/runtime/ModuleLoaderPrototype.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (209847 => 209848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-12-15 01:41:53 UTC (rev 209847)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-12-15 02:23:56 UTC (rev 209848)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-12-14 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ Update ModuleLoader code by using the latest builtin primitives
+ https://bugs.webkit.org/show_bug.cgi?id=165851
+
+ Reviewed by Sam Weinig.
+
+ Update the module loader code,
+
+ 1. Use @globalPrivate for the utilities, instead of setting them as the member of ModuleLoader.
+ 2. Use @putByValDirect instead of @push. @push is user-observable since it uses Set() operation
+ and it can be observed by defining indexed setters in Array.prototype.
+
+ * builtins/ModuleLoaderPrototype.js:
+ (ensureRegistered):
+ (fulfillFetch):
+ (commitInstantiated):
+ (requestFetch):
+ (requestSatisfy):
+ (setStateToMax): Deleted.
+ (newRegistryEntry): Deleted.
+ * runtime/ModuleLoaderPrototype.cpp:
+
</ins><span class="cx"> 2016-12-14 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><span class="cx"> The stress GC bot crashes in JavaScriptCore beneath ShadowChicken::update and Inspector::jsToInspectorValue
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebuiltinsModuleLoaderPrototypejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/builtins/ModuleLoaderPrototype.js (209847 => 209848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/builtins/ModuleLoaderPrototype.js 2016-12-15 01:41:53 UTC (rev 209847)
+++ trunk/Source/JavaScriptCore/builtins/ModuleLoaderPrototype.js 2016-12-15 02:23:56 UTC (rev 209848)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> // 2. Loader.fetch
</span><span class="cx"> // 3. Loader.instantiate
</span><span class="cx">
</span><ins>+@globalPrivate
</ins><span class="cx"> function setStateToMax(entry, newState)
</span><span class="cx"> {
</span><span class="cx"> // https://whatwg.github.io/loader/#set-state-to-max
</span><span class="lines">@@ -42,6 +43,7 @@
</span><span class="cx"> entry.state = newState;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+@globalPrivate
</ins><span class="cx"> function newRegistryEntry(key)
</span><span class="cx"> {
</span><span class="cx"> // https://whatwg.github.io/loader/#registry
</span><span class="lines">@@ -111,7 +113,7 @@
</span><span class="cx"> if (entry)
</span><span class="cx"> return entry;
</span><span class="cx">
</span><del>- entry = this.newRegistryEntry(key);
</del><ins>+ entry = @newRegistryEntry(key);
</ins><span class="cx"> this.registry.@set(key, entry);
</span><span class="cx">
</span><span class="cx"> return entry;
</span><span class="lines">@@ -134,7 +136,7 @@
</span><span class="cx"> if (!entry.fetch)
</span><span class="cx"> entry.fetch = @newPromiseCapability(@InternalPromise).@promise;
</span><span class="cx"> this.forceFulfillPromise(entry.fetch, payload);
</span><del>- this.setStateToMax(entry, @ModuleInstantiate);
</del><ins>+ @setStateToMax(entry, @ModuleInstantiate);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function fulfillInstantiate(entry, optionalInstance, source)
</span><span class="lines">@@ -180,13 +182,13 @@
</span><span class="cx"> key: depKey,
</span><span class="cx"> value: @undefined
</span><span class="cx"> };
</span><del>- dependencies.@push(pair);
</del><ins>+ @putByValDirect(dependencies, dependencies.length, pair);
</ins><span class="cx"> dependenciesMap.@set(depKey, pair);
</span><span class="cx"> }
</span><span class="cx"> entry.dependencies = dependencies;
</span><span class="cx"> entry.dependenciesMap = dependenciesMap;
</span><span class="cx"> entry.module = moduleRecord;
</span><del>- this.setStateToMax(entry, @ModuleSatisfy);
</del><ins>+ @setStateToMax(entry, @ModuleSatisfy);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function instantiation(result, source, entry)
</span><span class="lines">@@ -219,7 +221,7 @@
</span><span class="cx"> // For example, JavaScriptCore shell can provide the hook fetching the resource
</span><span class="cx"> // from the local file system.
</span><span class="cx"> var fetchPromise = this.fetch(key, initiator).then((payload) => {
</span><del>- this.setStateToMax(entry, @ModuleInstantiate);
</del><ins>+ @setStateToMax(entry, @ModuleInstantiate);
</ins><span class="cx"> return payload;
</span><span class="cx"> });
</span><span class="cx"> entry.fetch = fetchPromise;
</span><span class="lines">@@ -297,11 +299,11 @@
</span><span class="cx"> return entry;
</span><span class="cx"> });
</span><span class="cx"> });
</span><del>- depLoads.@push(promise);
</del><ins>+ @putByValDirect(depLoads, depLoads.length, promise);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return @InternalPromise.internalAll(depLoads).then((modules) => {
</span><del>- this.setStateToMax(entry, @ModuleLink);
</del><ins>+ @setStateToMax(entry, @ModuleLink);
</ins><span class="cx"> return entry;
</span><span class="cx"> });
</span><span class="cx"> });
</span><span class="lines">@@ -363,7 +365,7 @@
</span><span class="cx">
</span><span class="cx"> if (entry.state === @ModuleReady)
</span><span class="cx"> return;
</span><del>- this.setStateToMax(entry, @ModuleReady);
</del><ins>+ @setStateToMax(entry, @ModuleReady);
</ins><span class="cx">
</span><span class="cx"> // Since we already have the "dependencies" field,
</span><span class="cx"> // we can call moduleDeclarationInstantiation with the correct order
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeModuleLoaderPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ModuleLoaderPrototype.cpp (209847 => 209848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ModuleLoaderPrototype.cpp 2016-12-15 01:41:53 UTC (rev 209847)
+++ trunk/Source/JavaScriptCore/runtime/ModuleLoaderPrototype.cpp 2016-12-15 02:23:56 UTC (rev 209848)
</span><span class="lines">@@ -65,8 +65,6 @@
</span><span class="cx">
</span><span class="cx"> /* Source for ModuleLoaderPrototype.lut.h
</span><span class="cx"> @begin moduleLoaderPrototypeTable
</span><del>- setStateToMax JSBuiltin DontEnum|Function 2
- newRegistryEntry JSBuiltin DontEnum|Function 1
</del><span class="cx"> ensureRegistered JSBuiltin DontEnum|Function 1
</span><span class="cx"> forceFulfillPromise JSBuiltin DontEnum|Function 2
</span><span class="cx"> fulfillFetch JSBuiltin DontEnum|Function 2
</span></span></pre>
</div>
</div>
</body>
</html>