<!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>[207036] 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/207036">207036</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2016-10-10 17:45:45 -0700 (Mon, 10 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Change ArrayPrototype.cpp's putLength() and setLength() to take a VM& so that we can use vm.propertyNames.
https://bugs.webkit.org/show_bug.cgi?id=163260
Reviewed by Saam Barati.
In all cases where we call these, we already have the VM& anyway.
* runtime/ArrayPrototype.cpp:
(JSC::putLength):
(JSC::setLength):
(JSC::arrayProtoFuncPop):
(JSC::arrayProtoFuncPush):
(JSC::arrayProtoFuncShift):
(JSC::arrayProtoFuncSlice):
(JSC::arrayProtoFuncSplice):
(JSC::arrayProtoFuncUnShift):</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (207035 => 207036)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-10-11 00:11:40 UTC (rev 207035)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-10-11 00:45:45 UTC (rev 207036)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2016-10-10 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><ins>+ Change ArrayPrototype.cpp's putLength() and setLength() to take a VM& so that we can use vm.propertyNames.
+ https://bugs.webkit.org/show_bug.cgi?id=163260
+
+ Reviewed by Saam Barati.
+
+ In all cases where we call these, we already have the VM& anyway.
+
+ * runtime/ArrayPrototype.cpp:
+ (JSC::putLength):
+ (JSC::setLength):
+ (JSC::arrayProtoFuncPop):
+ (JSC::arrayProtoFuncPush):
+ (JSC::arrayProtoFuncShift):
+ (JSC::arrayProtoFuncSlice):
+ (JSC::arrayProtoFuncSplice):
+ (JSC::arrayProtoFuncUnShift):
+
+2016-10-10 Mark Lam <mark.lam@apple.com>
+
</ins><span class="cx"> Rename the StrictModeReadonlyPropertyWriteError string to ReadonlyPropertyWriteError.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=163239
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeArrayPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ArrayPrototype.cpp (207035 => 207036)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ArrayPrototype.cpp 2016-10-11 00:11:40 UTC (rev 207035)
+++ trunk/Source/JavaScriptCore/runtime/ArrayPrototype.cpp 2016-10-11 00:45:45 UTC (rev 207036)
</span><span class="lines">@@ -163,17 +163,17 @@
</span><span class="cx"> return slot.getValue(exec, index);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static ALWAYS_INLINE void putLength(ExecState* exec, JSObject* obj, JSValue value)
</del><ins>+static ALWAYS_INLINE void putLength(ExecState* exec, VM& vm, JSObject* obj, JSValue value)
</ins><span class="cx"> {
</span><span class="cx"> PutPropertySlot slot(obj);
</span><del>- obj->methodTable()->put(obj, exec, exec->propertyNames().length, value, slot);
</del><ins>+ obj->methodTable()->put(obj, exec, vm.propertyNames->length, value, slot);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static ALWAYS_INLINE void setLength(ExecState* exec, JSObject* obj, unsigned value)
</del><ins>+static ALWAYS_INLINE void setLength(ExecState* exec, VM& vm, JSObject* obj, unsigned value)
</ins><span class="cx"> {
</span><span class="cx"> if (isJSArray(obj))
</span><span class="cx"> jsCast<JSArray*>(obj)->setLength(exec, value);
</span><del>- putLength(exec, obj, jsNumber(value));
</del><ins>+ putLength(exec, vm, obj, jsNumber(value));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline bool speciesWatchpointsValid(ExecState* exec, JSObject* thisObject)
</span><span class="lines">@@ -679,7 +679,7 @@
</span><span class="cx">
</span><span class="cx"> JSValue result;
</span><span class="cx"> if (length == 0) {
</span><del>- putLength(exec, thisObj, jsNumber(length));
</del><ins>+ putLength(exec, vm, 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">@@ -688,7 +688,7 @@
</span><span class="cx"> throwTypeError(exec, scope, ASCIILiteral("Unable to delete property."));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><del>- putLength(exec, thisObj, jsNumber(length - 1));
</del><ins>+ putLength(exec, vm, thisObj, jsNumber(length - 1));
</ins><span class="cx"> }
</span><span class="cx"> return JSValue::encode(result);
</span><span class="cx"> }
</span><span class="lines">@@ -724,7 +724,7 @@
</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>- putLength(exec, thisObj, newLength);
</del><ins>+ putLength(exec, vm, thisObj, newLength);
</ins><span class="cx"> return JSValue::encode(newLength);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -826,13 +826,13 @@
</span><span class="cx">
</span><span class="cx"> JSValue result;
</span><span class="cx"> if (length == 0) {
</span><del>- putLength(exec, thisObj, jsNumber(length));
</del><ins>+ putLength(exec, vm, thisObj, jsNumber(length));
</ins><span class="cx"> result = jsUndefined();
</span><span class="cx"> } else {
</span><span class="cx"> result = thisObj->getIndex(exec, 0);
</span><span class="cx"> shift<JSArray::ShiftCountForShift>(exec, thisObj, 0, 1, 0, length);
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, encodedJSValue());
</span><del>- putLength(exec, thisObj, jsNumber(length - 1));
</del><ins>+ putLength(exec, vm, thisObj, jsNumber(length - 1));
</ins><span class="cx"> }
</span><span class="cx"> return JSValue::encode(result);
</span><span class="cx"> }
</span><span class="lines">@@ -876,7 +876,7 @@
</span><span class="cx"> if (v)
</span><span class="cx"> result->putDirectIndex(exec, n, v);
</span><span class="cx"> }
</span><del>- setLength(exec, result, n);
</del><ins>+ setLength(exec, vm, result, n);
</ins><span class="cx"> return JSValue::encode(result);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -906,8 +906,8 @@
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, encodedJSValue());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- setLength(exec, result, 0);
- setLength(exec, thisObj, length);
</del><ins>+ setLength(exec, vm, result, 0);
+ setLength(exec, vm, thisObj, length);
</ins><span class="cx"> return JSValue::encode(result);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -972,7 +972,7 @@
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, encodedJSValue());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- setLength(exec, thisObj, length - deleteCount + additionalArgs);
</del><ins>+ setLength(exec, vm, thisObj, length - deleteCount + additionalArgs);
</ins><span class="cx"> return JSValue::encode(result);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -998,7 +998,7 @@
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, encodedJSValue());
</span><span class="cx"> }
</span><span class="cx"> JSValue result = jsNumber(length + nrArgs);
</span><del>- putLength(exec, thisObj, result);
</del><ins>+ putLength(exec, vm, thisObj, result);
</ins><span class="cx"> return JSValue::encode(result);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>