<!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>[198589] 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/198589">198589</a></dd>
<dt>Author</dt> <dd>keith_miller@apple.com</dd>
<dt>Date</dt> <dd>2016-03-23 12:42:32 -0700 (Wed, 23 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Array.prototype native functions' species constructors should work with proxies
https://bugs.webkit.org/show_bug.cgi?id=155798
Reviewed by Mark Lam.
Before native the species constructors were checking if the this value was a JSArray.
Instead they should look check that the this value returns true on Array.isArray.
* runtime/ArrayPrototype.cpp:
(JSC::speciesConstructArray):
* tests/es6.yaml:
* tests/stress/proxy-array-prototype-methods.js:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeArrayPrototypecpp">trunk/Source/JavaScriptCore/runtime/ArrayPrototype.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoretestses6yaml">trunk/Source/JavaScriptCore/tests/es6.yaml</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressproxyarrayprototypemethodsjs">trunk/Source/JavaScriptCore/tests/stress/proxy-array-prototype-methods.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (198588 => 198589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-03-23 19:21:11 UTC (rev 198588)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-03-23 19:42:32 UTC (rev 198589)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-03-23 Keith Miller <keith_miller@apple.com>
+
+ Array.prototype native functions' species constructors should work with proxies
+ https://bugs.webkit.org/show_bug.cgi?id=155798
+
+ Reviewed by Mark Lam.
+
+ Before native the species constructors were checking if the this value was a JSArray.
+ Instead they should look check that the this value returns true on Array.isArray.
+
+ * runtime/ArrayPrototype.cpp:
+ (JSC::speciesConstructArray):
+ * tests/es6.yaml:
+ * tests/stress/proxy-array-prototype-methods.js:
+
</ins><span class="cx"> 2016-03-23 Saam barati <sbarati@apple.com>
</span><span class="cx">
</span><span class="cx"> We should not disable inlining when the debugger is enabled
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeArrayPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ArrayPrototype.cpp (198588 => 198589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ArrayPrototype.cpp 2016-03-23 19:21:11 UTC (rev 198588)
+++ trunk/Source/JavaScriptCore/runtime/ArrayPrototype.cpp 2016-03-23 19:42:32 UTC (rev 198589)
</span><span class="lines">@@ -184,7 +184,7 @@
</span><span class="cx"> {
</span><span class="cx"> // ECMA 9.4.2.3: https://tc39.github.io/ecma262/#sec-arrayspeciescreate
</span><span class="cx"> JSValue constructor = jsUndefined();
</span><del>- if (LIKELY(isJSArray(thisObject))) {
</del><ins>+ if (LIKELY(isArray(exec, thisObject))) {
</ins><span class="cx"> // Fast path in the normal case where the user has not set an own constructor and the Array.prototype.constructor is normal.
</span><span class="cx"> // We need prototype check for subclasses of Array, which are Array objects but have a different prototype by default.
</span><span class="cx"> if (LIKELY(!thisObject->hasCustomProperties()
</span><span class="lines">@@ -207,7 +207,9 @@
</span><span class="cx"> if (constructor.isNull())
</span><span class="cx"> return std::make_pair(SpeciesConstructResult::FastPath, nullptr);;
</span><span class="cx"> }
</span><del>- }
</del><ins>+ } else if (exec->hadException())
+ return std::make_pair(SpeciesConstructResult::Exception, nullptr);
+
</ins><span class="cx"> if (constructor.isUndefined())
</span><span class="cx"> return std::make_pair(SpeciesConstructResult::FastPath, nullptr);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestses6yaml"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/es6.yaml (198588 => 198589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/es6.yaml 2016-03-23 19:21:11 UTC (rev 198588)
+++ trunk/Source/JavaScriptCore/tests/es6.yaml 2016-03-23 19:42:32 UTC (rev 198589)
</span><span class="lines">@@ -959,7 +959,7 @@
</span><span class="cx"> - path: es6/Proxy_internal_get_calls_Array.prototype.shift.js
</span><span class="cx"> cmd: runES6 :normal
</span><span class="cx"> - path: es6/Proxy_internal_get_calls_Array.prototype.splice.js
</span><del>- cmd: runES6 :fail
</del><ins>+ cmd: runES6 :normal
</ins><span class="cx"> - path: es6/Proxy_internal_get_calls_Array.prototype.toString.js
</span><span class="cx"> cmd: runES6 :normal
</span><span class="cx"> - path: es6/Proxy_internal_get_calls_Array.prototype_iteration_methods.js
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressproxyarrayprototypemethodsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/stress/proxy-array-prototype-methods.js (198588 => 198589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/proxy-array-prototype-methods.js 2016-03-23 19:21:11 UTC (rev 198588)
+++ trunk/Source/JavaScriptCore/tests/stress/proxy-array-prototype-methods.js 2016-03-23 19:42:32 UTC (rev 198589)
</span><span class="lines">@@ -140,14 +140,55 @@
</span><span class="cx"> assert(hasProps.has("3"));
</span><span class="cx"> assert(hasProps.has("4"));
</span><span class="cx">
</span><del>- assert(getProps.size === 4);
</del><ins>+ assert(getProps.size === 5);
</ins><span class="cx"> assert(getProps.has("splice"));
</span><span class="cx"> assert(getProps.has("length"));
</span><ins>+ assert(getProps.has("constructor"));
</ins><span class="cx"> assert(getProps.has("2"));
</span><span class="cx"> assert(getProps.has("4"));
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> test(function() {
</span><ins>+ let delProps = new Set;
+ let hasProps = new Set;
+ let getProps = new Set;
+ let target = [ 0, , 1, , 2];
+ let handler = {
+ get(theTarget, key) {
+ getProps.add(key);
+ return Reflect.get(theTarget, key);
+ },
+ has(theTarget, key) {
+ hasProps.add(key);
+ return Reflect.has(theTarget, key);
+ },
+ deleteProperty(theTarget, key)
+ {
+ delProps.add(key);
+ return Reflect.deleteProperty(theTarget, key);
+ }
+ };
+
+ let proxy = new Proxy(target, handler);
+ proxy.slice(1, 5);
+
+ assert(delProps.size === 0);
+
+ assert(hasProps.size === 4);
+ assert(hasProps.has("1"));
+ assert(hasProps.has("2"));
+ assert(hasProps.has("3"));
+ assert(hasProps.has("4"));
+
+ assert(getProps.size === 5);
+ assert(getProps.has("slice"));
+ assert(getProps.has("length"));
+ assert(getProps.has("constructor"));
+ assert(getProps.has("2"));
+ assert(getProps.has("4"));
+});
+
+test(function() {
</ins><span class="cx"> let x = [1,2,3];
</span><span class="cx"> x.__proto__ = new Proxy([], {
</span><span class="cx"> get(theTarget, prop, receiver) {
</span></span></pre>
</div>
</div>
</body>
</html>