<!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>[207344] trunk</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/207344">207344</a></dd>
<dt>Author</dt> <dd>ryanhaddad@apple.com</dd>
<dt>Date</dt> <dd>2016-10-14 09:23:42 -0700 (Fri, 14 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/207322">r207322</a>.
This change caused JSC test failures
Reverted changeset:
"Fix Array.prototype.splice ES6 compliance."
https://bugs.webkit.org/show_bug.cgi?id=163372
http://trac.webkit.org/changeset/207322</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJSTestsChangeLog">trunk/JSTests/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeArrayPrototypecpp">trunk/Source/JavaScriptCore/runtime/ArrayPrototype.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkJSTestsstressarrayspliceonfrozenobjectjs">trunk/JSTests/stress/array-splice-on-frozen-object.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (207343 => 207344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog 2016-10-14 16:23:18 UTC (rev 207343)
+++ trunk/JSTests/ChangeLog 2016-10-14 16:23:42 UTC (rev 207344)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-10-14 Ryan Haddad <ryanhaddad@apple.com>
+
+ Unreviewed, rolling out r207322.
+
+ This change caused JSC test failures
+
+ Reverted changeset:
+
+ "Fix Array.prototype.splice ES6 compliance."
+ https://bugs.webkit.org/show_bug.cgi?id=163372
+ http://trac.webkit.org/changeset/207322
+
</ins><span class="cx"> 2016-10-14 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> JSON.parse should not modify frozen objects.
</span></span></pre></div>
<a id="trunkJSTestsstressarrayspliceonfrozenobjectjs"></a>
<div class="delfile"><h4>Deleted: trunk/JSTests/stress/array-splice-on-frozen-object.js (207343 => 207344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/stress/array-splice-on-frozen-object.js 2016-10-14 16:23:18 UTC (rev 207343)
+++ trunk/JSTests/stress/array-splice-on-frozen-object.js 2016-10-14 16:23:42 UTC (rev 207344)
</span><span class="lines">@@ -1,72 +0,0 @@
</span><del>-//@ runFTLNoCJIT
-
-let totalFailed = 0;
-
-function shouldEqual(testId, actual, expected) {
- if (actual != expected) {
- throw testId + ": ERROR: expect " + expected + ", actual " + actual;
- }
-}
-
-function makeArray() {
- return ['unmodifiable'];
-}
-
-function makeArrayLikeObject() {
- var obj = {};
- obj[0] = 'unmodifiable';
- obj.length = 1;
- return obj;
-}
-
-function emptyArraySourceMaker() {
- return [];
-}
-
-function singleElementArraySourceMaker() {
- return ['modified_1'];
-}
-
-// Make test functions with unique codeblocks.
-function makeSpliceWithNoArgsTest(testId) {
- return new Function("arr", "arr.splice(); return " + testId + ";");
-}
-function makeSpliceTest(testId) {
- return new Function("arr", "arr.splice(0); return " + testId + ";");
-}
-
-let numIterations = 10000;
-
-function runTest(testId, testMaker, targetMaker, sourceMaker, expectedValue, expectedException) {
- var test = testMaker(testId);
- noInline(test);
-
- for (var i = 0; i < numIterations; i++) {
- var exception = undefined;
-
- var obj = targetMaker();
- obj = Object.freeze(obj);
-
- var arr = sourceMaker();
- arr.constructor = { [Symbol.species]: function() { return obj; } };
-
- try {
- test(arr);
- } catch (e) {
- exception = "" + e;
- exception = exception.substr(0, 10); // Search for "TypeError:".
- }
- shouldEqual(testId, exception, expectedException);
- shouldEqual(testId, obj[0], expectedValue);
- }
-}
-
-runTest(10010, makeSpliceWithNoArgsTest, makeArray, emptyArraySourceMaker, "unmodifiable", "TypeError:");
-runTest(10011, makeSpliceWithNoArgsTest, makeArray, singleElementArraySourceMaker, "unmodifiable", "TypeError:");
-runTest(10020, makeSpliceWithNoArgsTest, makeArrayLikeObject, emptyArraySourceMaker, "unmodifiable", "TypeError:");
-runTest(10021, makeSpliceWithNoArgsTest, makeArrayLikeObject, singleElementArraySourceMaker, "unmodifiable", "TypeError:");
-
-runTest(10110, makeSpliceTest, makeArray, emptyArraySourceMaker, "unmodifiable", "TypeError:");
-runTest(10111, makeSpliceTest, makeArray, singleElementArraySourceMaker, "unmodifiable", "TypeError:");
-runTest(10120, makeSpliceTest, makeArrayLikeObject, emptyArraySourceMaker, "unmodifiable", "TypeError:");
-runTest(10121, makeSpliceTest, makeArrayLikeObject, singleElementArraySourceMaker, "unmodifiable", "TypeError:");
</del></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (207343 => 207344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-10-14 16:23:18 UTC (rev 207343)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-10-14 16:23:42 UTC (rev 207344)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-10-14 Ryan Haddad <ryanhaddad@apple.com>
+
+ Unreviewed, rolling out r207322.
+
+ This change caused JSC test failures
+
+ Reverted changeset:
+
+ "Fix Array.prototype.splice ES6 compliance."
+ https://bugs.webkit.org/show_bug.cgi?id=163372
+ http://trac.webkit.org/changeset/207322
+
</ins><span class="cx"> 2016-10-14 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> JSON.parse should not modify frozen objects.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeArrayPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ArrayPrototype.cpp (207343 => 207344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ArrayPrototype.cpp 2016-10-14 16:23:18 UTC (rev 207343)
+++ trunk/Source/JavaScriptCore/runtime/ArrayPrototype.cpp 2016-10-14 16:23:42 UTC (rev 207344)
</span><span class="lines">@@ -922,12 +922,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned actualStart = argumentClampedIndexFromStartOrEnd(exec, 0, length);
</span><del>- RETURN_IF_EXCEPTION(scope, encodedJSValue());
</del><span class="cx">
</span><span class="cx"> unsigned actualDeleteCount = length - actualStart;
</span><del>- unsigned insertCount = 0;
</del><span class="cx"> if (exec->argumentCount() > 1) {
</span><del>- insertCount = exec->argumentCount() - 2;
</del><span class="cx"> double deleteCount = exec->uncheckedArgument(1).toInteger(exec);
</span><span class="cx"> if (deleteCount < 0)
</span><span class="cx"> actualDeleteCount = 0;
</span><span class="lines">@@ -937,13 +934,9 @@
</span><span class="cx"> actualDeleteCount = static_cast<unsigned>(deleteCount);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // FIXME: Need to implement step 8 of the spec https://tc39.github.io/ecma262/#sec-array.prototype.splice here.
- // https://bugs.webkit.org/show_bug.cgi?id=163417
-
</del><span class="cx"> std::pair<SpeciesConstructResult, JSObject*> speciesResult = speciesConstructArray(exec, thisObj, actualDeleteCount);
</span><del>- ASSERT(!scope.exception() || speciesResult.first == SpeciesConstructResult::Exception);
</del><span class="cx"> if (speciesResult.first == SpeciesConstructResult::Exception)
</span><del>- return encodedJSValue();
</del><ins>+ return JSValue::encode(jsUndefined());
</ins><span class="cx">
</span><span class="cx"> JSObject* result = nullptr;
</span><span class="cx"> if (speciesResult.first == SpeciesConstructResult::FastPath && isJSArray(thisObj) && length == getLength(exec, thisObj))
</span><span class="lines">@@ -973,14 +966,10 @@
</span><span class="cx"> continue;
</span><span class="cx"> result->initializeIndex(vm, k, v);
</span><span class="cx"> }
</span><del>- ASSERT(!scope.exception());
</del><span class="cx"> }
</span><del>- setLength(exec, vm, result, actualDeleteCount);
- RETURN_IF_EXCEPTION(scope, encodedJSValue());
</del><span class="cx"> }
</span><span class="cx">
</span><del>- unsigned itemCount = insertCount;
- ASSERT(itemCount == static_cast<unsigned>(std::max<int>(exec->argumentCount() - 2, 0)));
</del><ins>+ unsigned itemCount = std::max<int>(exec->argumentCount() - 2, 0);
</ins><span class="cx"> if (itemCount < actualDeleteCount) {
</span><span class="cx"> shift<JSArray::ShiftCountForSplice>(exec, thisObj, actualStart, actualDeleteCount, itemCount, length);
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, encodedJSValue());
</span></span></pre>
</div>
</div>
</body>
</html>