<!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>[198531] 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/198531">198531</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-03-22 10:01:04 -0700 (Tue, 22 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[JSC] allow duplicate property names returned from Proxy ownKeys() trap
https://bugs.webkit.org/show_bug.cgi?id=155560
Patch by Caitlin Potter <caitp@igalia.com> on 2016-03-22
Reviewed by Darin Adler.
Specification allows duplicate property names to be reported by the
Proxy ownKeys() trap --- and this is observable in any API which
operates on the returned list, such as Object.keys(),
Object.getOwnPropertyNames(), Object.getOwnPropertySymbols(), or
Object.getOwnPropertyDescriptors().
* runtime/PropertyNameArray.h:
(JSC::PropertyNameArray::addUnchecked):
(JSC::PropertyNameArray::add):
(JSC::PropertyNameArray::addKnownUnique): Deleted.
* runtime/ProxyObject.cpp:
(JSC::ProxyObject::performGetOwnPropertyNames):
* runtime/Structure.cpp:
(JSC::Structure::getPropertyNamesFromStructure):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimePropertyNameArrayh">trunk/Source/JavaScriptCore/runtime/PropertyNameArray.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeProxyObjectcpp">trunk/Source/JavaScriptCore/runtime/ProxyObject.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeStructurecpp">trunk/Source/JavaScriptCore/runtime/Structure.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoretestses6yaml">trunk/Source/JavaScriptCore/tests/es6.yaml</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestses6Proxy_ownKeys_duplicatesjs">trunk/Source/JavaScriptCore/tests/es6/Proxy_ownKeys_duplicates.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (198530 => 198531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-03-22 16:02:22 UTC (rev 198530)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-03-22 17:01:04 UTC (rev 198531)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-03-22 Caitlin Potter <caitp@igalia.com>
+
+ [JSC] allow duplicate property names returned from Proxy ownKeys() trap
+ https://bugs.webkit.org/show_bug.cgi?id=155560
+
+ Reviewed by Darin Adler.
+
+ Specification allows duplicate property names to be reported by the
+ Proxy ownKeys() trap --- and this is observable in any API which
+ operates on the returned list, such as Object.keys(),
+ Object.getOwnPropertyNames(), Object.getOwnPropertySymbols(), or
+ Object.getOwnPropertyDescriptors().
+
+ * runtime/PropertyNameArray.h:
+ (JSC::PropertyNameArray::addUnchecked):
+ (JSC::PropertyNameArray::add):
+ (JSC::PropertyNameArray::addKnownUnique): Deleted.
+ * runtime/ProxyObject.cpp:
+ (JSC::ProxyObject::performGetOwnPropertyNames):
+ * runtime/Structure.cpp:
+ (JSC::Structure::getPropertyNamesFromStructure):
+
</ins><span class="cx"> 2016-03-21 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [JSC] Clean up Math.floor thunk and use SSE round instruction
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimePropertyNameArrayh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/PropertyNameArray.h (198530 => 198531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/PropertyNameArray.h 2016-03-22 16:02:22 UTC (rev 198530)
+++ trunk/Source/JavaScriptCore/runtime/PropertyNameArray.h 2016-03-22 17:01:04 UTC (rev 198531)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx">
</span><span class="cx"> void add(const Identifier&);
</span><span class="cx"> void add(UniquedStringImpl*);
</span><del>- void addKnownUnique(UniquedStringImpl*);
</del><ins>+ void addUnchecked(UniquedStringImpl*);
</ins><span class="cx">
</span><span class="cx"> Identifier& operator[](unsigned i) { return m_data->propertyNameVector()[i]; }
</span><span class="cx"> const Identifier& operator[](unsigned i) const { return m_data->propertyNameVector()[i]; }
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx"> add(identifier.impl());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ALWAYS_INLINE void PropertyNameArray::addKnownUnique(UniquedStringImpl* identifier)
</del><ins>+ALWAYS_INLINE void PropertyNameArray::addUnchecked(UniquedStringImpl* identifier)
</ins><span class="cx"> {
</span><span class="cx"> if (!isUidMatchedToTypeMode(identifier))
</span><span class="cx"> return;
</span><span class="lines">@@ -131,7 +131,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- addKnownUnique(identifier);
</del><ins>+ addUnchecked(identifier);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ALWAYS_INLINE bool PropertyNameArray::isUidMatchedToTypeMode(UniquedStringImpl* identifier)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeProxyObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ProxyObject.cpp (198530 => 198531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ProxyObject.cpp 2016-03-22 16:02:22 UTC (rev 198530)
+++ trunk/Source/JavaScriptCore/runtime/ProxyObject.cpp 2016-03-22 17:01:04 UTC (rev 198531)
</span><span class="lines">@@ -878,7 +878,7 @@
</span><span class="cx"> ++uncheckedResultKeys.add(ident.impl(), 0).iterator->value;
</span><span class="cx"> ++totalSize;
</span><span class="cx">
</span><del>- trapResult.add(ident.impl());
</del><ins>+ trapResult.addUnchecked(ident.impl());
</ins><span class="cx">
</span><span class="cx"> return dontExitEarly;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeStructurecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Structure.cpp (198530 => 198531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Structure.cpp 2016-03-22 16:02:22 UTC (rev 198530)
+++ trunk/Source/JavaScriptCore/runtime/Structure.cpp 2016-03-22 17:01:04 UTC (rev 198531)
</span><span class="lines">@@ -1060,7 +1060,7 @@
</span><span class="cx"> if (iter->key->isSymbol() && !propertyNames.includeSymbolProperties())
</span><span class="cx"> continue;
</span><span class="cx"> if (knownUnique)
</span><del>- propertyNames.addKnownUnique(iter->key);
</del><ins>+ propertyNames.addUnchecked(iter->key);
</ins><span class="cx"> else
</span><span class="cx"> propertyNames.add(iter->key);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestses6Proxy_ownKeys_duplicatesjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/es6/Proxy_ownKeys_duplicates.js (0 => 198531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/es6/Proxy_ownKeys_duplicates.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/es6/Proxy_ownKeys_duplicates.js 2016-03-22 17:01:04 UTC (rev 198531)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+function test() {
+
+var symbol = Symbol("test");
+var proxy = new Proxy({}, {
+ ownKeys: function (t) {
+ return ["A", "A", "0", "0", symbol, symbol];
+ }
+});
+var keys = Object.keys(proxy);
+var names = Object.getOwnPropertyNames(proxy);
+var symbols = Object.getOwnPropertySymbols(proxy);
+
+if (keys.length === 4 && keys[0] === keys[1] && keys[2] === keys[3] &&
+ keys[0] === "A" && keys[2] === "0" &&
+ names.length === 4 && names[0] === names[1] && names[2] === names[3] &&
+ names[0] === "A" && names[2] === "0" &&
+ symbols.length === 2 && symbols[0] === symbols[1] && symbols[0] === symbol)
+ return true;
+return false;
+
+}
+
+if (!test())
+ throw new Error("Test failed");
+
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestses6yaml"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/es6.yaml (198530 => 198531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/es6.yaml 2016-03-22 16:02:22 UTC (rev 198530)
+++ trunk/Source/JavaScriptCore/tests/es6.yaml 2016-03-22 17:01:04 UTC (rev 198531)
</span><span class="lines">@@ -1062,6 +1062,8 @@
</span><span class="cx"> cmd: runES6 :normal
</span><span class="cx"> - path: es6/Proxy_ownKeys_handler.js
</span><span class="cx"> cmd: runES6 :normal
</span><ins>+- path: es6/Proxy_ownKeys_duplicates.js
+ cmd: runES6 :normal
</ins><span class="cx"> - path: es6/Proxy_preventExtensions_handler.js
</span><span class="cx"> cmd: runES6 :normal
</span><span class="cx"> - path: es6/Proxy_Proxy.revocable.js
</span></span></pre>
</div>
</div>
</body>
</html>