<!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>[197899] 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/197899">197899</a></dd>
<dt>Author</dt> <dd>sbarati@apple.com</dd>
<dt>Date</dt> <dd>2016-03-09 16:36:06 -0800 (Wed, 09 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Array.isArray support for Proxy
https://bugs.webkit.org/show_bug.cgi?id=155179
Reviewed by Mark Lam.
This patch implements Array.isArray to be compliant
with the ES6 spec. Specifically, it needs to interface
properly with Proxy arguments.
https://tc39.github.io/ecma262/#sec-isarray
* runtime/ArrayConstructor.cpp:
(JSC::ArrayConstructor::getCallData):
(JSC::arrayConstructorIsArray):
(JSC::arrayConstructorPrivateFuncIsArrayConstructor):
* runtime/ArrayPrototype.cpp:
(JSC::speciesConstructArray):
* runtime/ProxyObject.cpp:
(JSC::ProxyObject::revoke):
(JSC::ProxyObject::isRevoked):
(JSC::ProxyObject::visitChildren):
* runtime/ProxyObject.h:
(JSC::ProxyObject::target):
(JSC::ProxyObject::handler):
* tests/es6.yaml:
* tests/stress/proxy-is-array.js: Added.
(assert):
(test):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeArrayConstructorcpp">trunk/Source/JavaScriptCore/runtime/ArrayConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeArrayPrototypecpp">trunk/Source/JavaScriptCore/runtime/ArrayPrototype.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeProxyObjectcpp">trunk/Source/JavaScriptCore/runtime/ProxyObject.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeProxyObjecth">trunk/Source/JavaScriptCore/runtime/ProxyObject.h</a></li>
<li><a href="#trunkSourceJavaScriptCoretestses6yaml">trunk/Source/JavaScriptCore/tests/es6.yaml</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestsstressproxyisarrayjs">trunk/Source/JavaScriptCore/tests/stress/proxy-is-array.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (197898 => 197899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-03-10 00:22:12 UTC (rev 197898)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-03-10 00:36:06 UTC (rev 197899)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2016-03-09 Saam barati <sbarati@apple.com>
+
+ Array.isArray support for Proxy
+ https://bugs.webkit.org/show_bug.cgi?id=155179
+
+ Reviewed by Mark Lam.
+
+ This patch implements Array.isArray to be compliant
+ with the ES6 spec. Specifically, it needs to interface
+ properly with Proxy arguments.
+ https://tc39.github.io/ecma262/#sec-isarray
+
+ * runtime/ArrayConstructor.cpp:
+ (JSC::ArrayConstructor::getCallData):
+ (JSC::arrayConstructorIsArray):
+ (JSC::arrayConstructorPrivateFuncIsArrayConstructor):
+ * runtime/ArrayPrototype.cpp:
+ (JSC::speciesConstructArray):
+ * runtime/ProxyObject.cpp:
+ (JSC::ProxyObject::revoke):
+ (JSC::ProxyObject::isRevoked):
+ (JSC::ProxyObject::visitChildren):
+ * runtime/ProxyObject.h:
+ (JSC::ProxyObject::target):
+ (JSC::ProxyObject::handler):
+ * tests/es6.yaml:
+ * tests/stress/proxy-is-array.js: Added.
+ (assert):
+ (test):
+
</ins><span class="cx"> 2016-03-09 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> [JSC] Fix the ARM64 MacroAssembler after r197816
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeArrayConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ArrayConstructor.cpp (197898 => 197899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ArrayConstructor.cpp 2016-03-10 00:22:12 UTC (rev 197898)
+++ trunk/Source/JavaScriptCore/runtime/ArrayConstructor.cpp 2016-03-10 00:36:06 UTC (rev 197899)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #include "JSArray.h"
</span><span class="cx"> #include "JSFunction.h"
</span><span class="cx"> #include "Lookup.h"
</span><ins>+#include "ProxyObject.h"
</ins><span class="cx"> #include "JSCInlines.h"
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="lines">@@ -125,9 +126,30 @@
</span><span class="cx"> return CallType::Host;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// ES6 7.2.2
+// https://tc39.github.io/ecma262/#sec-isarray
</ins><span class="cx"> EncodedJSValue JSC_HOST_CALL arrayConstructorIsArray(ExecState* exec)
</span><span class="cx"> {
</span><del>- return JSValue::encode(jsBoolean(exec->argument(0).inherits(JSArray::info())));
</del><ins>+ JSValue argumentValue = exec->argument(0);
+
+ if (!argumentValue.isObject())
+ return JSValue::encode(jsBoolean(false));
+
+ JSObject* argument = jsCast<JSObject*>(argumentValue);
+ while (true) {
+ if (argument->inherits(JSArray::info()))
+ return JSValue::encode(jsBoolean(true));
+
+ if (argument->type() != ProxyObjectType)
+ return JSValue::encode(jsBoolean(false));
+
+ ProxyObject* proxy = jsCast<ProxyObject*>(argument);
+ if (proxy->isRevoked())
+ return throwVMTypeError(exec, ASCIILiteral("Array.isArray can not be called on a Proxy that has been revoked."));
+ argument = proxy->target();
+ }
+
+ ASSERT_NOT_REACHED();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL arrayConstructorPrivateFuncIsArrayConstructor(ExecState* exec)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeArrayPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ArrayPrototype.cpp (197898 => 197899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ArrayPrototype.cpp 2016-03-10 00:22:12 UTC (rev 197898)
+++ trunk/Source/JavaScriptCore/runtime/ArrayPrototype.cpp 2016-03-10 00:36:06 UTC (rev 197899)
</span><span class="lines">@@ -205,7 +205,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> if (constructor.isUndefined())
</span><del>- return std::make_pair(SpeciesConstructResult::FastPath, nullptr);;
</del><ins>+ return std::make_pair(SpeciesConstructResult::FastPath, nullptr);
</ins><span class="cx">
</span><span class="cx"> MarkedArgumentBuffer args;
</span><span class="cx"> args.append(jsNumber(length));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeProxyObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ProxyObject.cpp (197898 => 197899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ProxyObject.cpp 2016-03-10 00:22:12 UTC (rev 197898)
+++ trunk/Source/JavaScriptCore/runtime/ProxyObject.cpp 2016-03-10 00:36:06 UTC (rev 197899)
</span><span class="lines">@@ -1085,6 +1085,11 @@
</span><span class="cx"> m_handler.set(vm, this, jsNull());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool ProxyObject::isRevoked() const
+{
+ return handler().isNull();
+}
+
</ins><span class="cx"> void ProxyObject::visitChildren(JSCell* cell, SlotVisitor& visitor)
</span><span class="cx"> {
</span><span class="cx"> ProxyObject* thisObject = jsCast<ProxyObject*>(cell);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeProxyObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ProxyObject.h (197898 => 197899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ProxyObject.h 2016-03-10 00:22:12 UTC (rev 197898)
+++ trunk/Source/JavaScriptCore/runtime/ProxyObject.h 2016-03-10 00:36:06 UTC (rev 197899)
</span><span class="lines">@@ -59,14 +59,15 @@
</span><span class="cx">
</span><span class="cx"> DECLARE_EXPORT_INFO;
</span><span class="cx">
</span><del>- JSObject* target() { return m_target.get(); }
- JSValue handler() { return m_handler.get(); }
</del><ins>+ JSObject* target() const { return m_target.get(); }
+ JSValue handler() const { return m_handler.get(); }
</ins><span class="cx">
</span><span class="cx"> static void put(JSCell*, ExecState*, PropertyName, JSValue, PutPropertySlot&);
</span><span class="cx"> static void putByIndex(JSCell*, ExecState*, unsigned propertyName, JSValue, bool shouldThrow);
</span><span class="cx"> void putByIndexCommon(ExecState*, JSValue thisValue, unsigned propertyName, JSValue putValue, bool shouldThrow);
</span><span class="cx"> JSValue performGetPrototype(ExecState*);
</span><span class="cx"> void revoke(VM&);
</span><ins>+ bool isRevoked() const;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> ProxyObject(VM&, Structure*);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestses6yaml"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/es6.yaml (197898 => 197899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/es6.yaml 2016-03-10 00:22:12 UTC (rev 197898)
+++ trunk/Source/JavaScriptCore/tests/es6.yaml 2016-03-10 00:36:06 UTC (rev 197899)
</span><span class="lines">@@ -909,7 +909,7 @@
</span><span class="cx"> - path: es6/Proxy_apply_handler.js
</span><span class="cx"> cmd: runES6 :normal
</span><span class="cx"> - path: es6/Proxy_Array.isArray_support.js
</span><del>- cmd: runES6 :fail
</del><ins>+ cmd: runES6 :normal
</ins><span class="cx"> - path: es6/Proxy_construct_handler.js
</span><span class="cx"> cmd: runES6 :normal
</span><span class="cx"> - path: es6/Proxy_constructor_requires_new.js
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressproxyisarrayjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/proxy-is-array.js (0 => 197899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/proxy-is-array.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/proxy-is-array.js 2016-03-10 00:36:06 UTC (rev 197899)
</span><span class="lines">@@ -0,0 +1,61 @@
</span><ins>+function assert(b) {
+ if (!b)
+ throw new Error("Bad assertion.")
+}
+
+function test(f) {
+ for (let i = 0; i < 500; i++)
+ f();
+}
+
+test(function() {
+ let proxy = new Proxy([], {});
+ assert(Array.isArray(proxy));
+});
+
+test(function() {
+ let {proxy, revoke} = Proxy.revocable([], {});
+ assert(Array.isArray(proxy));
+
+ revoke();
+ let threw = false;
+ try {
+ Array.isArray(proxy);
+ } catch(e) {
+ threw = true;
+ assert(e.toString() === "TypeError: Array.isArray can not be called on a Proxy that has been revoked.");
+ }
+ assert(threw);
+});
+
+test(function() {
+ let proxyChain = new Proxy([], {});
+ for (let i = 0; i < 400; i++)
+ proxyChain = new Proxy(proxyChain, {});
+ assert(Array.isArray(proxyChain));
+});
+
+test(function() {
+ let proxyChain = new Proxy([], {});
+ let revoke = null;
+ for (let i = 0; i < 400; i++) {
+ if (i !== 250) {
+ proxyChain = new Proxy(proxyChain, {});
+ } else {
+ let result = Proxy.revocable(proxyChain, {});
+ proxyChain = result.proxy;
+ revoke = result.revoke;
+ }
+ }
+ assert(Array.isArray(proxyChain));
+
+ revoke();
+ let threw = false;
+ try {
+ Array.isArray(proxyChain);
+ } catch(e) {
+ threw = true;
+ assert(e.toString() === "TypeError: Array.isArray can not be called on a Proxy that has been revoked.");
+ }
+ assert(threw);
+});
</ins></span></pre>
</div>
</div>
</body>
</html>