<!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>[201672] 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/201672">201672</a></dd>
<dt>Author</dt> <dd>sbarati@apple.com</dd>
<dt>Date</dt> <dd>2016-06-03 17:34:27 -0700 (Fri, 03 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Proxy.ownKeys should no longer throw an exception when duplicate keys are returned and the target is non-extensible
https://bugs.webkit.org/show_bug.cgi?id=158350
<rdar://problem/26626211>
Reviewed by Michael Saboff.
The spec was recently changes in Proxy [[OwnPropertyKeys]]
to allow for duplicate property names under certain circumstances.
This patch fixes our implementation to match the spec.
See: https://github.com/tc39/ecma262/pull/594
* runtime/ProxyObject.cpp:
(JSC::ProxyObject::performGetOwnPropertyNames):
* tests/stress/proxy-own-keys.js:
(i.catch):
(ownKeys):
(assert):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeProxyObjectcpp">trunk/Source/JavaScriptCore/runtime/ProxyObject.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressproxyownkeysjs">trunk/Source/JavaScriptCore/tests/stress/proxy-own-keys.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (201671 => 201672)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-06-04 00:04:52 UTC (rev 201671)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-06-04 00:34:27 UTC (rev 201672)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2016-06-03 Saam barati <sbarati@apple.com>
</span><span class="cx">
</span><ins>+ Proxy.ownKeys should no longer throw an exception when duplicate keys are returned and the target is non-extensible
+ https://bugs.webkit.org/show_bug.cgi?id=158350
+ <rdar://problem/26626211>
+
+ Reviewed by Michael Saboff.
+
+ The spec was recently changes in Proxy [[OwnPropertyKeys]]
+ to allow for duplicate property names under certain circumstances.
+ This patch fixes our implementation to match the spec.
+ See: https://github.com/tc39/ecma262/pull/594
+
+ * runtime/ProxyObject.cpp:
+ (JSC::ProxyObject::performGetOwnPropertyNames):
+ * tests/stress/proxy-own-keys.js:
+ (i.catch):
+ (ownKeys):
+ (assert):
+
+2016-06-03 Saam barati <sbarati@apple.com>
+
</ins><span class="cx"> Some shadow chicken code is wrong when run on a big endian CPU
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=158361
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeProxyObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ProxyObject.cpp (201671 => 201672)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ProxyObject.cpp 2016-06-04 00:04:52 UTC (rev 201671)
+++ trunk/Source/JavaScriptCore/runtime/ProxyObject.cpp 2016-06-04 00:34:27 UTC (rev 201672)
</span><span class="lines">@@ -861,7 +861,7 @@
</span><span class="cx"> CallData callData;
</span><span class="cx"> CallType callType;
</span><span class="cx"> JSValue ownKeysMethod = handler->getMethod(exec, callData, callType, makeIdentifier(vm, "ownKeys"), ASCIILiteral("'ownKeys' property of a Proxy's handler should be callable"));
</span><del>- if (exec->hadException())
</del><ins>+ if (vm.exception())
</ins><span class="cx"> return;
</span><span class="cx"> JSObject* target = this->target();
</span><span class="cx"> if (ownKeysMethod.isUndefined()) {
</span><span class="lines">@@ -872,7 +872,7 @@
</span><span class="cx"> MarkedArgumentBuffer arguments;
</span><span class="cx"> arguments.append(target);
</span><span class="cx"> JSValue arrayLikeObject = call(exec, ownKeysMethod, callType, callData, handler, arguments);
</span><del>- if (exec->hadException())
</del><ins>+ if (vm.exception())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> PropertyNameMode propertyNameMode = trapResult.mode();
</span><span class="lines">@@ -890,8 +890,7 @@
</span><span class="cx"> }
</span><span class="cx"> ASSERT(resultFilter);
</span><span class="cx"> RuntimeTypeMask dontThrowAnExceptionTypeFilter = TypeString | TypeSymbol;
</span><del>- HashMap<UniquedStringImpl*, unsigned> uncheckedResultKeys;
- unsigned totalSize = 0;
</del><ins>+ HashSet<UniquedStringImpl*> uncheckedResultKeys;
</ins><span class="cx">
</span><span class="cx"> auto addPropName = [&] (JSValue value, RuntimeType type) -> bool {
</span><span class="cx"> static const bool doExitEarly = true;
</span><span class="lines">@@ -901,33 +900,30 @@
</span><span class="cx"> return dontExitEarly;
</span><span class="cx">
</span><span class="cx"> Identifier ident = value.toPropertyKey(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (vm.exception())
</ins><span class="cx"> return doExitEarly;
</span><span class="cx">
</span><del>- ++uncheckedResultKeys.add(ident.impl(), 0).iterator->value;
- ++totalSize;
-
</del><ins>+ uncheckedResultKeys.add(ident.impl());
</ins><span class="cx"> trapResult.addUnchecked(ident.impl());
</span><del>-
</del><span class="cx"> return dontExitEarly;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> createListFromArrayLike(exec, arrayLikeObject, dontThrowAnExceptionTypeFilter, ASCIILiteral("Proxy handler's 'ownKeys' method must return an array-like object containing only Strings and Symbols"), addPropName);
</span><del>- if (exec->hadException())
</del><ins>+ if (vm.exception())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> bool targetIsExensible = target->isExtensible(exec);
</span><span class="cx">
</span><span class="cx"> PropertyNameArray targetKeys(&vm, propertyNameMode);
</span><span class="cx"> target->methodTable(vm)->getOwnPropertyNames(target, exec, targetKeys, enumerationMode);
</span><del>- if (exec->hadException())
</del><ins>+ if (vm.exception())
</ins><span class="cx"> return;
</span><span class="cx"> Vector<UniquedStringImpl*> targetConfigurableKeys;
</span><span class="cx"> Vector<UniquedStringImpl*> targetNonConfigurableKeys;
</span><span class="cx"> for (const Identifier& ident : targetKeys) {
</span><span class="cx"> PropertyDescriptor descriptor;
</span><span class="cx"> bool isPropertyDefined = target->getOwnPropertyDescriptor(exec, ident.impl(), descriptor);
</span><del>- if (exec->hadException())
</del><ins>+ if (vm.exception())
</ins><span class="cx"> return;
</span><span class="cx"> if (isPropertyDefined && !descriptor.configurable())
</span><span class="cx"> targetNonConfigurableKeys.append(ident.impl());
</span><span class="lines">@@ -935,26 +931,18 @@
</span><span class="cx"> targetConfigurableKeys.append(ident.impl());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- auto removeIfContainedInUncheckedResultKeys = [&] (UniquedStringImpl* impl) -> bool {
- static const bool isContainedIn = true;
- static const bool isNotContainedIn = false;
-
</del><ins>+ enum ContainedIn { IsContainedIn, IsNotContainedIn };
+ auto removeIfContainedInUncheckedResultKeys = [&] (UniquedStringImpl* impl) -> ContainedIn {
</ins><span class="cx"> auto iter = uncheckedResultKeys.find(impl);
</span><span class="cx"> if (iter == uncheckedResultKeys.end())
</span><del>- return isNotContainedIn;
</del><ins>+ return IsNotContainedIn;
</ins><span class="cx">
</span><del>- unsigned& count = iter->value;
- if (count == 0)
- return isNotContainedIn;
-
- --count;
- --totalSize;
- return isContainedIn;
</del><ins>+ uncheckedResultKeys.remove(iter);
+ return IsContainedIn;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> for (UniquedStringImpl* impl : targetNonConfigurableKeys) {
</span><del>- bool contains = removeIfContainedInUncheckedResultKeys(impl);
- if (!contains) {
</del><ins>+ if (removeIfContainedInUncheckedResultKeys(impl) == IsNotContainedIn) {
</ins><span class="cx"> throwVMTypeError(exec, makeString("Proxy object's 'target' has the non-configurable property '", String(impl), "' that was not in the result from the 'ownKeys' trap"));
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -964,22 +952,14 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> for (UniquedStringImpl* impl : targetConfigurableKeys) {
</span><del>- bool contains = removeIfContainedInUncheckedResultKeys(impl);
- if (!contains) {
</del><ins>+ if (removeIfContainedInUncheckedResultKeys(impl) == IsNotContainedIn) {
</ins><span class="cx"> throwVMTypeError(exec, makeString("Proxy object's non-extensible 'target' has configurable property '", String(impl), "' that was not in the result from the 'ownKeys' trap"));
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#ifndef NDEBUG
- unsigned sum = 0;
- for (unsigned keyCount : uncheckedResultKeys.values())
- sum += keyCount;
- ASSERT(sum == totalSize);
-#endif
-
- if (totalSize) {
- throwVMTypeError(exec, ASCIILiteral("Proxy handler's 'ownKeys' method returned a key that was not present in its target or it returned duplicate keys"));
</del><ins>+ if (uncheckedResultKeys.size()) {
+ throwVMTypeError(exec, ASCIILiteral("Proxy handler's 'ownKeys' method returned a key that was not present in its non-extensible target"));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressproxyownkeysjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/stress/proxy-own-keys.js (201671 => 201672)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/proxy-own-keys.js 2016-06-04 00:04:52 UTC (rev 201671)
+++ trunk/Source/JavaScriptCore/tests/stress/proxy-own-keys.js 2016-06-04 00:34:27 UTC (rev 201672)
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx"> Object.keys(proxy);
</span><span class="cx"> } catch(e) {
</span><span class="cx"> threw = true;
</span><del>- assert(e.toString() === "TypeError: Proxy handler's 'ownKeys' method returned a key that was not present in its target or it returned duplicate keys");
</del><ins>+ assert(e.toString() === "TypeError: Proxy handler's 'ownKeys' method returned a key that was not present in its non-extensible target");
</ins><span class="cx"> }
</span><span class="cx"> assert(threw);
</span><span class="cx"> assert(called);
</span><span class="lines">@@ -169,6 +169,75 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> {
</span><ins>+ let target = {};
+ let called1 = false;
+ let called2 = false;
+ Object.defineProperty(target, 'a', { value: 42, configurable: false });
+ let p1 = new Proxy(target, {
+ ownKeys() {
+ called1 = true;
+ return ['a', 'a'];
+ }
+ });
+ let p2 = new Proxy(p1, {
+ ownKeys() {
+ called2 = true;
+ return ['a'];
+ }
+ });
+
+ for (let i = 0; i < 500; i++) {
+ // FIXME: we may update the spec to make this test not throw.
+ // see: https://github.com/tc39/ecma262/pull/594
+ let threw = false;
+ try {
+ Reflect.ownKeys(p2);
+ } catch(e) {
+ assert(e.toString() === "TypeError: Proxy object's 'target' has the non-configurable property 'a' that was not in the result from the 'ownKeys' trap");
+ threw = true;
+ }
+ assert(threw);
+ assert(called1);
+ assert(called2);
+ }
+}
+
+{
+ let target = {};
+ let called1 = false;
+ let called2 = false;
+ Object.defineProperty(target, 'a', { value: 42, configurable: true });
+ Object.preventExtensions(target);
+ let p1 = new Proxy(target, {
+ ownKeys() {
+ called1 = true;
+ return ['a', 'a'];
+ }
+ });
+ let p2 = new Proxy(p1, {
+ ownKeys() {
+ called2 = true;
+ return ['a'];
+ }
+ });
+
+ for (let i = 0; i < 500; i++) {
+ // FIXME: we may update the spec to make this test not throw.
+ // see: https://github.com/tc39/ecma262/pull/594
+ let threw = false;
+ try {
+ Reflect.ownKeys(p2);
+ } catch(e) {
+ assert(e.toString() === "TypeError: Proxy object's non-extensible 'target' has configurable property 'a' that was not in the result from the 'ownKeys' trap");
+ threw = true;
+ }
+ assert(threw);
+ assert(called1);
+ assert(called2);
+ }
+}
+
+{
</ins><span class="cx"> let target = { };
</span><span class="cx"> Object.defineProperty(target, "x", {
</span><span class="cx"> configurable: true,
</span><span class="lines">@@ -186,14 +255,7 @@
</span><span class="cx">
</span><span class="cx"> let proxy = new Proxy(target, handler);
</span><span class="cx"> for (let i = 0; i < 500; i++) {
</span><del>- let threw = false;
- try {
- Object.keys(proxy);
- } catch(e) {
- threw = true;
- assert(e.toString() === "TypeError: Proxy handler's 'ownKeys' method returned a key that was not present in its target or it returned duplicate keys");
- }
- assert(threw);
</del><ins>+ Object.keys(proxy);
</ins><span class="cx"> assert(called);
</span><span class="cx"> called = false;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>