<!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>[198294] 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/198294">198294</a></dd>
<dt>Author</dt> <dd>sbarati@apple.com</dd>
<dt>Date</dt> <dd>2016-03-16 12:49:36 -0700 (Wed, 16 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[ES6] Make Array.prototype.reverse spec compatible.
https://bugs.webkit.org/show_bug.cgi?id=155528
Reviewed by Michael Saboff.
This patch make Array.prototype.reverse spec compatible.
Before, we weren't performing a HasProperty of each index
before performing a Get on that index. We now do that on
the slow path.
* runtime/ArrayPrototype.cpp:
(JSC::arrayProtoFuncReverse):
* tests/stress/array-reverse-proxy.js: Added.
(assert):
(test):
(shallowCopy):
(shallowEqual):
(let.handler.get getSet):
(test.let.handler.get getSet):</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>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestsstressarrayreverseproxyjs">trunk/Source/JavaScriptCore/tests/stress/array-reverse-proxy.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (198293 => 198294)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-03-16 19:47:48 UTC (rev 198293)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-03-16 19:49:36 UTC (rev 198294)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-03-16 Saam Barati <sbarati@apple.com>
+
+ [ES6] Make Array.prototype.reverse spec compatible.
+ https://bugs.webkit.org/show_bug.cgi?id=155528
+
+ Reviewed by Michael Saboff.
+
+ This patch make Array.prototype.reverse spec compatible.
+ Before, we weren't performing a HasProperty of each index
+ before performing a Get on that index. We now do that on
+ the slow path.
+
+ * runtime/ArrayPrototype.cpp:
+ (JSC::arrayProtoFuncReverse):
+ * tests/stress/array-reverse-proxy.js: Added.
+ (assert):
+ (test):
+ (shallowCopy):
+ (shallowEqual):
+ (let.handler.get getSet):
+ (test.let.handler.get getSet):
+
</ins><span class="cx"> 2016-03-16 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r198235, r198240, r198241, and
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeArrayPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ArrayPrototype.cpp (198293 => 198294)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ArrayPrototype.cpp 2016-03-16 19:47:48 UTC (rev 198293)
+++ trunk/Source/JavaScriptCore/runtime/ArrayPrototype.cpp 2016-03-16 19:49:36 UTC (rev 198294)
</span><span class="lines">@@ -737,8 +737,9 @@
</span><span class="cx"> if (!thisObject)
</span><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx">
</span><ins>+ VM& vm = exec->vm();
</ins><span class="cx"> unsigned length = getLength(exec, thisObject);
</span><del>- if (exec->hadException())
</del><ins>+ if (vm.exception())
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> switch (thisObject->indexingType()) {
</span><span class="lines">@@ -776,31 +777,40 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned middle = length / 2;
</span><del>- for (unsigned k = 0; k < middle; k++) {
- unsigned lk1 = length - k - 1;
- JSValue obj2 = getProperty(exec, thisObject, lk1);
- if (exec->hadException())
</del><ins>+ for (unsigned lower = 0; lower < middle; lower++) {
+ unsigned upper = length - lower - 1;
+ bool lowerExists = thisObject->hasProperty(exec, lower);
+ if (vm.exception())
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><del>- JSValue obj = getProperty(exec, thisObject, k);
- if (exec->hadException())
</del><ins>+ JSValue lowerValue;
+ if (lowerExists)
+ lowerValue = thisObject->get(exec, lower);
+
+ bool upperExists = thisObject->hasProperty(exec, upper);
+ if (vm.exception())
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><ins>+ JSValue upperValue;
+ if (upperExists)
+ upperValue = thisObject->get(exec, upper);
</ins><span class="cx">
</span><del>- if (obj2) {
- thisObject->putByIndexInline(exec, k, obj2, true);
- if (exec->hadException())
- return JSValue::encode(jsUndefined());
- } else if (!thisObject->methodTable(exec->vm())->deletePropertyByIndex(thisObject, exec, k)) {
- throwTypeError(exec, ASCIILiteral("Unable to delete property."));
- return JSValue::encode(jsUndefined());
</del><ins>+ if (upperExists) {
+ thisObject->putByIndexInline(exec, lower, upperValue, true);
+ if (vm.exception())
+ return JSValue::encode(JSValue());
+ } else if (!thisObject->methodTable(vm)->deletePropertyByIndex(thisObject, exec, lower)) {
+ if (!vm.exception())
+ throwTypeError(exec, ASCIILiteral("Unable to delete property."));
+ return JSValue::encode(JSValue());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (obj) {
- thisObject->putByIndexInline(exec, lk1, obj, true);
- if (exec->hadException())
- return JSValue::encode(jsUndefined());
- } else if (!thisObject->methodTable(exec->vm())->deletePropertyByIndex(thisObject, exec, lk1)) {
- throwTypeError(exec, ASCIILiteral("Unable to delete property."));
- return JSValue::encode(jsUndefined());
</del><ins>+ if (lowerExists) {
+ thisObject->putByIndexInline(exec, upper, lowerValue, true);
+ if (vm.exception())
+ return JSValue::encode(JSValue());
+ } else if (!thisObject->methodTable(vm)->deletePropertyByIndex(thisObject, exec, upper)) {
+ if (!vm.exception())
+ throwTypeError(exec, ASCIILiteral("Unable to delete property."));
+ return JSValue::encode(JSValue());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> return JSValue::encode(thisObject);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestses6yaml"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/es6.yaml (198293 => 198294)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/es6.yaml 2016-03-16 19:47:48 UTC (rev 198293)
+++ trunk/Source/JavaScriptCore/tests/es6.yaml 2016-03-16 19:49:36 UTC (rev 198294)
</span><span class="lines">@@ -941,7 +941,7 @@
</span><span class="cx"> - path: es6/Proxy_internal_deleteProperty_calls_Array.prototype.pop.js
</span><span class="cx"> cmd: runES6 :normal
</span><span class="cx"> - path: es6/Proxy_internal_deleteProperty_calls_Array.prototype.reverse.js
</span><del>- cmd: runES6 :fail
</del><ins>+ cmd: runES6 :normal
</ins><span class="cx"> - path: es6/Proxy_internal_deleteProperty_calls_Array.prototype.shift.js
</span><span class="cx"> cmd: runES6 :fail
</span><span class="cx"> - path: es6/Proxy_internal_deleteProperty_calls_Array.prototype.splice.js
</span><span class="lines">@@ -955,7 +955,7 @@
</span><span class="cx"> - path: es6/Proxy_internal_get_calls_Array.prototype.pop.js
</span><span class="cx"> cmd: runES6 :normal
</span><span class="cx"> - path: es6/Proxy_internal_get_calls_Array.prototype.reverse.js
</span><del>- cmd: runES6 :fail
</del><ins>+ cmd: runES6 :normal
</ins><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><span class="lines">@@ -1047,7 +1047,7 @@
</span><span class="cx"> - path: es6/Proxy_internal_set_calls_Array.prototype.push.js
</span><span class="cx"> cmd: runES6 :normal
</span><span class="cx"> - path: es6/Proxy_internal_set_calls_Array.prototype.reverse.js
</span><del>- cmd: runES6 :fail
</del><ins>+ cmd: runES6 :normal
</ins><span class="cx"> - path: es6/Proxy_internal_set_calls_Array.prototype.shift.js
</span><span class="cx"> cmd: runES6 :fail
</span><span class="cx"> - path: es6/Proxy_internal_set_calls_Array.prototype.splice.js
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressarrayreverseproxyjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/array-reverse-proxy.js (0 => 198294)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/array-reverse-proxy.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/array-reverse-proxy.js 2016-03-16 19:49:36 UTC (rev 198294)
</span><span class="lines">@@ -0,0 +1,221 @@
</span><ins>+function assert(b) {
+ if (!b)
+ throw new Error("bad assertion!");
+}
+
+function test(f) {
+ for (let i = 0; i < 1000; i++)
+ f();
+}
+
+function shallowCopy(arr) {
+ let result = [];
+ for (let item of arr)
+ result.push(item);
+ return result;
+}
+
+function shallowEqual(a, b) {
+ if (a.length !== b.length)
+ return false;
+ for (let i = 0; i < a.length; i++) {
+ if (a[i] !== b[i])
+ return false;
+ }
+
+ return true;
+}
+
+test(function() {
+ let target = [10, 20, 30, 40];
+ let copy = shallowCopy(target);
+ let handler = { };
+ let proxy = new Proxy(target, handler);
+ proxy.reverse();
+ copy.reverse();
+ assert(shallowEqual(proxy, target));
+ assert(shallowEqual(target, copy));
+});
+
+test(function() {
+ let target = [10, 20, 30, 40];
+ let copy = shallowCopy(target);
+ let getSet = new Set;
+ let hasSet = new Set;
+ let handler = {
+ get(theTarget, key) {
+ getSet.add(key);
+ return theTarget[key];
+ },
+ has(theTarget, key) {
+ hasSet.add(key);
+ return Reflect.has(theTarget, key);
+ }
+ };
+ let proxy = new Proxy(target, handler);
+ proxy.reverse();
+ copy.reverse();
+ assert(shallowEqual(proxy, target));
+ assert(shallowEqual(target, copy));
+
+ assert(getSet.has("0"));
+ assert(getSet.has("1"));
+ assert(getSet.has("2"));
+ assert(getSet.has("3"));
+ assert(getSet.has("length"));
+
+ assert(hasSet.has("0"));
+ assert(hasSet.has("1"));
+ assert(hasSet.has("2"));
+ assert(hasSet.has("3"));
+});
+
+test(function() {
+ let target = [10, 20, 30, 40];
+ let getSet = new Set;
+ let hasSet = new Set;
+ let deleteSet = new Set;
+ let handler = {
+ get(theTarget, key) {
+ getSet.add(key);
+ return theTarget[key];
+ },
+ has(theTarget, key) {
+ hasSet.add(key);
+ if (key === "0" || key === "1")
+ return true;
+ assert(key === "2" || key === "3");
+ return false;
+ },
+ deleteProperty(theTarget, key) {
+ deleteSet.add(key);
+ return Reflect.deleteProperty(theTarget, key);
+ }
+ };
+
+ let proxy = new Proxy(target, handler);
+ proxy.reverse();
+ assert(shallowEqual(proxy, target));
+
+ assert(getSet.has("0"));
+ assert(getSet.has("1"));
+ assert(getSet.has("2"));
+ assert(getSet.has("3"));
+ assert(getSet.has("length"));
+ assert(getSet.has("reverse"));
+ assert(getSet.size === 6);
+
+ assert(hasSet.has("0"));
+ assert(hasSet.has("1"));
+ assert(hasSet.has("2"));
+ assert(hasSet.has("3"));
+ assert(hasSet.size === 4);
+
+ assert(deleteSet.has("0"));
+ assert(deleteSet.has("1"));
+ assert(!deleteSet.has("2"));
+ assert(!deleteSet.has("3"));
+});
+
+test(function() {
+ let target = [10, 20, 30, 40];
+ let error;
+ let handler = {
+ has(theTarget, key) {
+ return false;
+ },
+ deleteProperty(theTarget, key) {
+ if (key === "0") {
+ error = new Error;
+ throw error;
+ }
+ return true;
+ }
+ };
+
+ let proxy = new Proxy(target, handler);
+ let threw = false;
+ try {
+ proxy.reverse();
+ } catch(e) {
+ threw = true;
+ assert(e === error);
+ }
+ assert(threw);
+});
+
+test(function() {
+ let target = [10, 20, 30, 40];
+ let error;
+ let handler = {
+ has(theTarget, key) {
+ if (key === "0") {
+ error = new Error;
+ throw error;
+ }
+ return false;
+ }
+ };
+
+ let proxy = new Proxy(target, handler);
+ let threw = false;
+ try {
+ proxy.reverse();
+ } catch(e) {
+ threw = true;
+ assert(e === error);
+ }
+ assert(threw);
+});
+
+test(function() {
+ let target = [10, 20, 30, 40];
+ let error;
+ let handler = {
+ has(theTarget, key) {
+ if (key === "3") {
+ error = new Error;
+ throw error;
+ }
+ return false;
+ }
+ };
+
+ let proxy = new Proxy(target, handler);
+ let threw = false;
+ try {
+ proxy.reverse();
+ } catch(e) {
+ threw = true;
+ assert(e === error);
+ }
+ assert(threw);
+});
+
+test(function() {
+ let target = [10, 20, 30, 40];
+ let error;
+ let getSet = new Set;
+ let handler = {
+ get(theTarget, key) {
+ getSet.add(key);
+ return theTarget[key];
+ },
+ has(theTarget, key) {
+ return false;
+ },
+ deleteProperty() {
+ return true;
+ }
+ };
+
+ let proxy = new Proxy(target, handler);
+ proxy.reverse();
+ assert(!getSet.has("0"));
+ assert(!getSet.has("1"));
+ assert(!getSet.has("2"));
+ assert(!getSet.has("3"));
+ assert(getSet.size === 2);
+ assert(getSet.has("reverse"));
+ assert(getSet.has("length"));
+});
</ins></span></pre>
</div>
</div>
</body>
</html>