<!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>[171521] branches/safari-600.1-branch/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/171521">171521</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-07-24 13:53:40 -0700 (Thu, 24 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/171328">r171328</a>. <rdar://problem/17544620></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchSourceJavaScriptCoreChangeLog">branches/safari-600.1-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceJavaScriptCoreruntimeArrayPrototypecpp">branches/safari-600.1-branch/Source/JavaScriptCore/runtime/ArrayPrototype.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/JavaScriptCore/ChangeLog (171520 => 171521)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/JavaScriptCore/ChangeLog 2014-07-24 20:47:07 UTC (rev 171520)
+++ branches/safari-600.1-branch/Source/JavaScriptCore/ChangeLog 2014-07-24 20:53:40 UTC (rev 171521)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2014-07-24 Lucas Forschler <lforschler@apple.com>
+
+ Merge r171328
+
+ 2014-07-21 Mark Lam <mark.lam@apple.com>
+
+ Refactor ArrayPrototype to use getLength() and putLength() utility functions.
+ https://bugs.webkit.org/show_bug.cgi?id=135139.
+
+ Reviewed by Oliver Hunt.
+
+ - Specialize putProperty() to putLength() because it is only used for setting
+ the length property.
+ - Added a getLength() utility function to get the value of the length property.
+ - Use these getLength() and putLength() functions instead of the existing code
+ to get and put the length property. Less code to read, easier to understand.
+
+ * runtime/ArrayPrototype.cpp:
+ (JSC::getLength):
+ (JSC::putLength):
+ (JSC::arrayProtoFuncToString):
+ (JSC::arrayProtoFuncToLocaleString):
+ (JSC::arrayProtoFuncJoin):
+ (JSC::arrayProtoFuncPop):
+ (JSC::arrayProtoFuncPush):
+ (JSC::arrayProtoFuncReverse):
+ (JSC::arrayProtoFuncShift):
+ (JSC::arrayProtoFuncSlice):
+ (JSC::arrayProtoFuncSort):
+ (JSC::arrayProtoFuncSplice):
+ (JSC::arrayProtoFuncUnShift):
+ (JSC::arrayProtoFuncReduce):
+ (JSC::arrayProtoFuncReduceRight):
+ (JSC::arrayProtoFuncIndexOf):
+ (JSC::arrayProtoFuncLastIndexOf):
+ (JSC::putProperty): Deleted.
+
</ins><span class="cx"> 2014-07-23 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r171474 (rollout r171367 from trunk)
</span></span></pre></div>
<a id="branchessafari6001branchSourceJavaScriptCoreruntimeArrayPrototypecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/JavaScriptCore/runtime/ArrayPrototype.cpp (171520 => 171521)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/JavaScriptCore/runtime/ArrayPrototype.cpp 2014-07-24 20:47:07 UTC (rev 171520)
+++ branches/safari-600.1-branch/Source/JavaScriptCore/runtime/ArrayPrototype.cpp 2014-07-24 20:53:40 UTC (rev 171521)
</span><span class="lines">@@ -157,10 +157,15 @@
</span><span class="cx"> return slot.getValue(exec, index);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void putProperty(ExecState* exec, JSObject* obj, PropertyName propertyName, JSValue value)
</del><ins>+static ALWAYS_INLINE unsigned getLength(ExecState* exec, JSObject* obj)
</ins><span class="cx"> {
</span><ins>+ return obj->get(exec, exec->propertyNames().length).toUInt32(exec);
+}
+
+static void putLength(ExecState* exec, JSObject* obj, JSValue value)
+{
</ins><span class="cx"> PutPropertySlot slot(obj);
</span><del>- obj->methodTable()->put(obj, exec, propertyName, value, slot);
</del><ins>+ obj->methodTable()->put(obj, exec, exec->propertyNames().length, value, slot);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static unsigned argumentClampedIndexFromStartOrEnd(ExecState* exec, int argument, unsigned length, unsigned undefinedValue = 0)
</span><span class="lines">@@ -296,7 +301,7 @@
</span><span class="cx"> ASSERT(isJSArray(thisValue));
</span><span class="cx"> JSArray* thisObj = asArray(thisValue);
</span><span class="cx">
</span><del>- unsigned length = thisObj->get(exec, exec->propertyNames().length).toUInt32(exec);
</del><ins>+ unsigned length = getLength(exec, thisObj);
</ins><span class="cx"> if (exec->hadException())
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="lines">@@ -335,7 +340,7 @@
</span><span class="cx"> if (exec->hadException())
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><del>- unsigned length = thisObj->get(exec, exec->propertyNames().length).toUInt32(exec);
</del><ins>+ unsigned length = getLength(exec, thisObj);
</ins><span class="cx"> if (exec->hadException())
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="lines">@@ -373,7 +378,7 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL arrayProtoFuncJoin(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSObject* thisObj = exec->thisValue().toThis(exec, StrictMode).toObject(exec);
</span><del>- unsigned length = thisObj->get(exec, exec->propertyNames().length).toUInt32(exec);
</del><ins>+ unsigned length = getLength(exec, thisObj);
</ins><span class="cx"> if (exec->hadException())
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="lines">@@ -475,13 +480,13 @@
</span><span class="cx"> return JSValue::encode(asArray(thisValue)->pop(exec));
</span><span class="cx">
</span><span class="cx"> JSObject* thisObj = thisValue.toObject(exec);
</span><del>- unsigned length = thisObj->get(exec, exec->propertyNames().length).toUInt32(exec);
</del><ins>+ unsigned length = getLength(exec, thisObj);
</ins><span class="cx"> if (exec->hadException())
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> JSValue result;
</span><span class="cx"> if (length == 0) {
</span><del>- putProperty(exec, thisObj, exec->propertyNames().length, jsNumber(length));
</del><ins>+ putLength(exec, thisObj, jsNumber(length));
</ins><span class="cx"> result = jsUndefined();
</span><span class="cx"> } else {
</span><span class="cx"> result = thisObj->get(exec, length - 1);
</span><span class="lines">@@ -491,7 +496,7 @@
</span><span class="cx"> throwTypeError(exec, ASCIILiteral("Unable to delete property."));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><del>- putProperty(exec, thisObj, exec->propertyNames().length, jsNumber(length - 1));
</del><ins>+ putLength(exec, thisObj, jsNumber(length - 1));
</ins><span class="cx"> }
</span><span class="cx"> return JSValue::encode(result);
</span><span class="cx"> }
</span><span class="lines">@@ -507,7 +512,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSObject* thisObj = thisValue.toObject(exec);
</span><del>- unsigned length = thisObj->get(exec, exec->propertyNames().length).toUInt32(exec);
</del><ins>+ unsigned length = getLength(exec, thisObj);
</ins><span class="cx"> if (exec->hadException())
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="lines">@@ -525,14 +530,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSValue newLength(static_cast<int64_t>(length) + static_cast<int64_t>(exec->argumentCount()));
</span><del>- putProperty(exec, thisObj, exec->propertyNames().length, newLength);
</del><ins>+ putLength(exec, thisObj, newLength);
</ins><span class="cx"> return JSValue::encode(newLength);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL arrayProtoFuncReverse(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSObject* thisObj = exec->thisValue().toThis(exec, StrictMode).toObject(exec);
</span><del>- unsigned length = thisObj->get(exec, exec->propertyNames().length).toUInt32(exec);
</del><ins>+ unsigned length = getLength(exec, thisObj);
</ins><span class="cx"> if (exec->hadException())
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="lines">@@ -570,20 +575,20 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL arrayProtoFuncShift(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSObject* thisObj = exec->thisValue().toThis(exec, StrictMode).toObject(exec);
</span><del>- unsigned length = thisObj->get(exec, exec->propertyNames().length).toUInt32(exec);
</del><ins>+ unsigned length = getLength(exec, thisObj);
</ins><span class="cx"> if (exec->hadException())
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> JSValue result;
</span><span class="cx"> if (length == 0) {
</span><del>- putProperty(exec, thisObj, exec->propertyNames().length, jsNumber(length));
</del><ins>+ putLength(exec, thisObj, jsNumber(length));
</ins><span class="cx"> result = jsUndefined();
</span><span class="cx"> } else {
</span><span class="cx"> result = thisObj->get(exec, 0);
</span><span class="cx"> shift<JSArray::ShiftCountForShift>(exec, thisObj, 0, 1, 0, length);
</span><span class="cx"> if (exec->hadException())
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><del>- putProperty(exec, thisObj, exec->propertyNames().length, jsNumber(length - 1));
</del><ins>+ putLength(exec, thisObj, jsNumber(length - 1));
</ins><span class="cx"> }
</span><span class="cx"> return JSValue::encode(result);
</span><span class="cx"> }
</span><span class="lines">@@ -592,7 +597,7 @@
</span><span class="cx"> {
</span><span class="cx"> // http://developer.netscape.com/docs/manuals/js/client/jsref/array.htm#1193713 or 15.4.4.10
</span><span class="cx"> JSObject* thisObj = exec->thisValue().toThis(exec, StrictMode).toObject(exec);
</span><del>- unsigned length = thisObj->get(exec, exec->propertyNames().length).toUInt32(exec);
</del><ins>+ unsigned length = getLength(exec, thisObj);
</ins><span class="cx"> if (exec->hadException())
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="lines">@@ -700,7 +705,7 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL arrayProtoFuncSort(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSObject* thisObj = exec->thisValue().toThis(exec, StrictMode).toObject(exec);
</span><del>- unsigned length = thisObj->get(exec, exec->propertyNames().length).toUInt32(exec);
</del><ins>+ unsigned length = getLength(exec, thisObj);
</ins><span class="cx"> if (!length || exec->hadException())
</span><span class="cx"> return JSValue::encode(thisObj);
</span><span class="cx">
</span><span class="lines">@@ -775,7 +780,7 @@
</span><span class="cx"> // 15.4.4.12
</span><span class="cx">
</span><span class="cx"> JSObject* thisObj = exec->thisValue().toThis(exec, StrictMode).toObject(exec);
</span><del>- unsigned length = thisObj->get(exec, exec->propertyNames().length).toUInt32(exec);
</del><ins>+ unsigned length = getLength(exec, thisObj);
</ins><span class="cx"> if (exec->hadException())
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="lines">@@ -824,7 +829,7 @@
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- putProperty(exec, thisObj, exec->propertyNames().length, jsNumber(length - deleteCount + additionalArgs));
</del><ins>+ putLength(exec, thisObj, jsNumber(length - deleteCount + additionalArgs));
</ins><span class="cx"> return JSValue::encode(result);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -833,7 +838,7 @@
</span><span class="cx"> // 15.4.4.13
</span><span class="cx">
</span><span class="cx"> JSObject* thisObj = exec->thisValue().toThis(exec, StrictMode).toObject(exec);
</span><del>- unsigned length = thisObj->get(exec, exec->propertyNames().length).toUInt32(exec);
</del><ins>+ unsigned length = getLength(exec, thisObj);
</ins><span class="cx"> if (exec->hadException())
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="lines">@@ -849,14 +854,14 @@
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx"> JSValue result = jsNumber(length + nrArgs);
</span><del>- putProperty(exec, thisObj, exec->propertyNames().length, result);
</del><ins>+ putLength(exec, thisObj, result);
</ins><span class="cx"> return JSValue::encode(result);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL arrayProtoFuncReduce(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSObject* thisObj = exec->thisValue().toThis(exec, StrictMode).toObject(exec);
</span><del>- unsigned length = thisObj->get(exec, exec->propertyNames().length).toUInt32(exec);
</del><ins>+ unsigned length = getLength(exec, thisObj);
</ins><span class="cx"> if (exec->hadException())
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="lines">@@ -933,7 +938,7 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL arrayProtoFuncReduceRight(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSObject* thisObj = exec->thisValue().toThis(exec, StrictMode).toObject(exec);
</span><del>- unsigned length = thisObj->get(exec, exec->propertyNames().length).toUInt32(exec);
</del><ins>+ unsigned length = getLength(exec, thisObj);
</ins><span class="cx"> if (exec->hadException())
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="lines">@@ -1010,7 +1015,7 @@
</span><span class="cx"> {
</span><span class="cx"> // 15.4.4.14
</span><span class="cx"> JSObject* thisObj = exec->thisValue().toThis(exec, StrictMode).toObject(exec);
</span><del>- unsigned length = thisObj->get(exec, exec->propertyNames().length).toUInt32(exec);
</del><ins>+ unsigned length = getLength(exec, thisObj);
</ins><span class="cx"> if (exec->hadException())
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="lines">@@ -1033,7 +1038,7 @@
</span><span class="cx"> {
</span><span class="cx"> // 15.4.4.15
</span><span class="cx"> JSObject* thisObj = exec->thisValue().toThis(exec, StrictMode).toObject(exec);
</span><del>- unsigned length = thisObj->get(exec, exec->propertyNames().length).toUInt32(exec);
</del><ins>+ unsigned length = getLength(exec, thisObj);
</ins><span class="cx"> if (!length)
</span><span class="cx"> return JSValue::encode(jsNumber(-1));
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>