<!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>[212430] 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/212430">212430</a></dd>
<dt>Author</dt> <dd>utatane.tea@gmail.com</dd>
<dt>Date</dt> <dd>2017-02-16 04:41:06 -0800 (Thu, 16 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[JSC] Update module namespace object according to the latest ECMA262
https://bugs.webkit.org/show_bug.cgi?id=168280
Reviewed by Saam Barati.
JSTests:
* modules/namespace-object-symbol-iterator-name.js:
* modules/namespace-object-typed-array-fast-path.js:
* modules/namespace.js:
(shouldBe.JSON.stringify.Reflect.getOwnPropertyDescriptor):
(shouldThrow):
Source/JavaScriptCore:
Reflect updates to the module namespace object.
1. @@iterator property is dropped[1].
2. @@toStringTag property becomes non-configurable[1].
3. delete with Symbol should be delegated to the JSObject's one[2].
[1]: https://tc39.github.io/ecma262/#sec-module-namespace-objects
[2]: https://github.com/tc39/ecma262/pull/767
* runtime/JSModuleNamespaceObject.cpp:
(JSC::JSModuleNamespaceObject::finishCreation):
(JSC::JSModuleNamespaceObject::deleteProperty):
(JSC::moduleNamespaceObjectSymbolIterator): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJSTestsChangeLog">trunk/JSTests/ChangeLog</a></li>
<li><a href="#trunkJSTestsmodulesnamespaceobjectsymboliteratornamejs">trunk/JSTests/modules/namespace-object-symbol-iterator-name.js</a></li>
<li><a href="#trunkJSTestsmodulesnamespaceobjecttypedarrayfastpathjs">trunk/JSTests/modules/namespace-object-typed-array-fast-path.js</a></li>
<li><a href="#trunkJSTestsmodulesnamespacejs">trunk/JSTests/modules/namespace.js</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSModuleNamespaceObjectcpp">trunk/Source/JavaScriptCore/runtime/JSModuleNamespaceObject.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (212429 => 212430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog 2017-02-16 12:16:26 UTC (rev 212429)
+++ trunk/JSTests/ChangeLog 2017-02-16 12:41:06 UTC (rev 212430)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2017-02-16 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ [JSC] Update module namespace object according to the latest ECMA262
+ https://bugs.webkit.org/show_bug.cgi?id=168280
+
+ Reviewed by Saam Barati.
+
+ * modules/namespace-object-symbol-iterator-name.js:
+ * modules/namespace-object-typed-array-fast-path.js:
+ * modules/namespace.js:
+ (shouldBe.JSON.stringify.Reflect.getOwnPropertyDescriptor):
+ (shouldThrow):
+
</ins><span class="cx"> 2017-02-11 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [JSC] Implement (Shared)ArrayBuffer.prototype.byteLength
</span></span></pre></div>
<a id="trunkJSTestsmodulesnamespaceobjectsymboliteratornamejs"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/modules/namespace-object-symbol-iterator-name.js (212429 => 212430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/modules/namespace-object-symbol-iterator-name.js 2017-02-16 12:16:26 UTC (rev 212429)
+++ trunk/JSTests/modules/namespace-object-symbol-iterator-name.js 2017-02-16 12:41:06 UTC (rev 212430)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><span class="cx"> import { shouldBe } from "./resources/assert.js";
</span><span class="cx"> import * as ns from "./namespace-object-symbol-iterator-name.js";
</span><span class="cx">
</span><del>-shouldBe(ns[Symbol.iterator].name, "[Symbol.iterator]");
</del><ins>+shouldBe(ns[Symbol.iterator], undefined);
</ins></span></pre></div>
<a id="trunkJSTestsmodulesnamespaceobjecttypedarrayfastpathjs"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/modules/namespace-object-typed-array-fast-path.js (212429 => 212430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/modules/namespace-object-typed-array-fast-path.js 2017-02-16 12:16:26 UTC (rev 212429)
+++ trunk/JSTests/modules/namespace-object-typed-array-fast-path.js 2017-02-16 12:41:06 UTC (rev 212430)
</span><span class="lines">@@ -4,4 +4,4 @@
</span><span class="cx"> export let hello = 44;
</span><span class="cx">
</span><span class="cx"> let array = new Uint8Array(ns);
</span><del>-shouldBe(array.length, 2);
</del><ins>+shouldBe(array.length, 0);
</ins></span></pre></div>
<a id="trunkJSTestsmodulesnamespacejs"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/modules/namespace.js (212429 => 212430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/modules/namespace.js 2017-02-16 12:16:26 UTC (rev 212429)
+++ trunk/JSTests/modules/namespace.js 2017-02-16 12:41:06 UTC (rev 212430)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> shouldBe('Matcha' in namespace, true);
</span><span class="cx"> shouldBe('Mocha' in namespace, true);
</span><span class="cx"> shouldBe('default' in namespace, true);
</span><del>-shouldBe(Symbol.iterator in namespace, true);
</del><ins>+shouldBe(Symbol.iterator in namespace, false);
</ins><span class="cx"> shouldBe('Tea' in namespace, false);
</span><span class="cx">
</span><span class="cx"> shouldBe(namespace.__proto__, undefined);
</span><span class="lines">@@ -61,15 +61,9 @@
</span><span class="cx">
</span><span class="cx"> // These names should be shown in the code point order.
</span><span class="cx"> shouldBe(JSON.stringify(Object.getOwnPropertyNames(namespace)), `["Cappuccino","Cocoa","Matcha","Mocha","default"]`);
</span><del>-shouldBe(Object.getOwnPropertySymbols(namespace).length, 2);
-shouldBe(Object.getOwnPropertySymbols(namespace)[0], Symbol.iterator);
-shouldBe(Object.getOwnPropertySymbols(namespace)[1], Symbol.toStringTag);
</del><ins>+shouldBe(Object.getOwnPropertySymbols(namespace).length, 1);
+shouldBe(Object.getOwnPropertySymbols(namespace)[0], Symbol.toStringTag);
</ins><span class="cx">
</span><del>-shouldBe(typeof namespace[Symbol.iterator], 'function');
-var array = Array.from(namespace);
-// These names should be shown in the code point order.
-shouldBe(JSON.stringify(array), `["Cappuccino","Cocoa","Matcha","Mocha","default"]`);
-
</del><span class="cx"> // The imported binding properties of the namespace object seen as writable, but, it does not mean that it is writable by users.
</span><span class="cx"> shouldBe(JSON.stringify(Reflect.getOwnPropertyDescriptor(namespace, "Cocoa")), `{"value":"Cocoa","writable":true,"enumerable":true,"configurable":false}`);
</span><span class="cx"> shouldBe(JSON.stringify(Reflect.getOwnPropertyDescriptor(namespace, "Matcha")), `{"value":"Matcha","writable":true,"enumerable":true,"configurable":false}`);
</span><span class="lines">@@ -79,10 +73,9 @@
</span><span class="cx"> namespace.Cocoa = 'Cocoa';
</span><span class="cx"> }, `TypeError: Attempted to assign to readonly property.`);
</span><span class="cx">
</span><del>-// In the case of non imported properties, we just return the original descriptor.
-// But still these properties cannot be changed.
-shouldBe(JSON.stringify(Reflect.getOwnPropertyDescriptor(namespace, Symbol.iterator)), `{"writable":true,"enumerable":false,"configurable":true}`);
</del><ins>+shouldBe(JSON.stringify(Reflect.getOwnPropertyDescriptor(namespace, Symbol.toStringTag)), `{"value":"Module","writable":false,"enumerable":false,"configurable":false}`);
</ins><span class="cx"> shouldThrow(() => {
</span><del>- namespace[Symbol.iterator] = 42;
</del><ins>+ namespace[Symbol.toStringTag] = 42;
</ins><span class="cx"> }, `TypeError: Attempted to assign to readonly property.`);
</span><span class="cx">
</span><ins>+shouldBe(Reflect.deleteProperty(namespace, Symbol.toStringTag), false);
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (212429 => 212430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2017-02-16 12:16:26 UTC (rev 212429)
+++ trunk/Source/JavaScriptCore/ChangeLog 2017-02-16 12:41:06 UTC (rev 212430)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2017-02-16 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ [JSC] Update module namespace object according to the latest ECMA262
+ https://bugs.webkit.org/show_bug.cgi?id=168280
+
+ Reviewed by Saam Barati.
+
+ Reflect updates to the module namespace object.
+
+ 1. @@iterator property is dropped[1].
+ 2. @@toStringTag property becomes non-configurable[1].
+ 3. delete with Symbol should be delegated to the JSObject's one[2].
+
+ [1]: https://tc39.github.io/ecma262/#sec-module-namespace-objects
+ [2]: https://github.com/tc39/ecma262/pull/767
+
+ * runtime/JSModuleNamespaceObject.cpp:
+ (JSC::JSModuleNamespaceObject::finishCreation):
+ (JSC::JSModuleNamespaceObject::deleteProperty):
+ (JSC::moduleNamespaceObjectSymbolIterator): Deleted.
+
</ins><span class="cx"> 2017-02-16 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Fix the build after r212424.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSModuleNamespaceObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSModuleNamespaceObject.cpp (212429 => 212430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSModuleNamespaceObject.cpp 2017-02-16 12:16:26 UTC (rev 212429)
+++ trunk/Source/JavaScriptCore/runtime/JSModuleNamespaceObject.cpp 2017-02-16 12:41:06 UTC (rev 212430)
</span><span class="lines">@@ -30,15 +30,11 @@
</span><span class="cx"> #include "Error.h"
</span><span class="cx"> #include "JSCInlines.h"
</span><span class="cx"> #include "JSModuleEnvironment.h"
</span><del>-#include "JSPropertyNameIterator.h"
</del><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><del>-static EncodedJSValue JSC_HOST_CALL moduleNamespaceObjectSymbolIterator(ExecState*);
-
</del><span class="cx"> const ClassInfo JSModuleNamespaceObject::s_info = { "ModuleNamespaceObject", &Base::s_info, nullptr, CREATE_METHOD_TABLE(JSModuleNamespaceObject) };
</span><span class="cx">
</span><del>-
</del><span class="cx"> JSModuleNamespaceObject::JSModuleNamespaceObject(VM& vm, Structure* structure)
</span><span class="cx"> : Base(vm, structure)
</span><span class="cx"> , m_exports()
</span><span class="lines">@@ -45,7 +41,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void JSModuleNamespaceObject::finishCreation(ExecState* exec, JSGlobalObject* globalObject, AbstractModuleRecord* moduleRecord, const IdentifierSet& exports)
</del><ins>+void JSModuleNamespaceObject::finishCreation(ExecState* exec, JSGlobalObject*, AbstractModuleRecord* moduleRecord, const IdentifierSet& exports)
</ins><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="lines">@@ -69,9 +65,7 @@
</span><span class="cx"> m_exports.add(identifier);
</span><span class="cx">
</span><span class="cx"> m_moduleRecord.set(vm, this, moduleRecord);
</span><del>- JSFunction* iteratorFunction = JSFunction::create(vm, globalObject, 0, ASCIILiteral("[Symbol.iterator]"), moduleNamespaceObjectSymbolIterator, NoIntrinsic);
- putDirect(vm, vm.propertyNames->iteratorSymbol, iteratorFunction, DontEnum);
- putDirect(vm, vm.propertyNames->toStringTagSymbol, jsString(&vm, "Module"), DontEnum | ReadOnly);
</del><ins>+ putDirect(vm, vm.propertyNames->toStringTagSymbol, jsString(&vm, "Module"), DontEnum | DontDelete | ReadOnly);
</ins><span class="cx">
</span><span class="cx"> // http://www.ecma-international.org/ecma-262/6.0/#sec-module-namespace-exotic-objects-getprototypeof
</span><span class="cx"> // http://www.ecma-international.org/ecma-262/6.0/#sec-module-namespace-exotic-objects-setprototypeof-v
</span><span class="lines">@@ -181,10 +175,13 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool JSModuleNamespaceObject::deleteProperty(JSCell* cell, ExecState*, PropertyName propertyName)
</del><ins>+bool JSModuleNamespaceObject::deleteProperty(JSCell* cell, ExecState* exec, PropertyName propertyName)
</ins><span class="cx"> {
</span><span class="cx"> // http://www.ecma-international.org/ecma-262/6.0/#sec-module-namespace-exotic-objects-delete-p
</span><span class="cx"> JSModuleNamespaceObject* thisObject = jsCast<JSModuleNamespaceObject*>(cell);
</span><ins>+ if (propertyName.isSymbol())
+ return JSObject::deleteProperty(thisObject, exec, propertyName);
+
</ins><span class="cx"> return !thisObject->m_exports.contains(propertyName.uid());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -208,15 +205,4 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-EncodedJSValue JSC_HOST_CALL moduleNamespaceObjectSymbolIterator(ExecState* exec)
-{
- VM& vm = exec->vm();
- auto scope = DECLARE_THROW_SCOPE(vm);
-
- JSModuleNamespaceObject* object = jsDynamicCast<JSModuleNamespaceObject*>(vm, exec->thisValue());
- if (!object)
- return throwVMTypeError(exec, scope, ASCIILiteral("|this| should be a module namespace object"));
- return JSValue::encode(JSPropertyNameIterator::create(exec, exec->lexicalGlobalObject()->propertyNameIteratorStructure(), object));
-}
-
</del><span class="cx"> } // namespace JSC
</span></span></pre>
</div>
</div>
</body>
</html>