<!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>[166397] 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/166397">166397</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-27 22:28:39 -0700 (Thu, 27 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/166376">r166376</a>.
https://bugs.webkit.org/show_bug.cgi?id=130887
This was a misguided optimization. (Requested by kling on
#webkit).
Reverted changeset:
"Avoid fetching JSObject::structure() repeatedly in
putDirectInternal."
https://bugs.webkit.org/show_bug.cgi?id=130857
http://trac.webkit.org/changeset/166376</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSObjecth">trunk/Source/JavaScriptCore/runtime/JSObject.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (166396 => 166397)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-03-28 04:06:58 UTC (rev 166396)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-03-28 05:28:39 UTC (rev 166397)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-03-27 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r166376.
+ https://bugs.webkit.org/show_bug.cgi?id=130887
+
+ This was a misguided optimization. (Requested by kling on
+ #webkit).
+
+ Reverted changeset:
+
+ "Avoid fetching JSObject::structure() repeatedly in
+ putDirectInternal."
+ https://bugs.webkit.org/show_bug.cgi?id=130857
+ http://trac.webkit.org/changeset/166376
+
</ins><span class="cx"> 2014-03-27 Oliver Hunt <oliver@apple.com>
</span><span class="cx">
</span><span class="cx"> Support spread operand in |new| expressions
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSObject.h (166396 => 166397)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSObject.h 2014-03-28 04:06:58 UTC (rev 166396)
+++ trunk/Source/JavaScriptCore/runtime/JSObject.h 2014-03-28 05:28:39 UTC (rev 166397)
</span><span class="lines">@@ -1325,35 +1325,35 @@
</span><span class="cx">
</span><span class="cx"> DeferGC deferGC(vm.heap);
</span><span class="cx"> Butterfly* newButterfly = butterfly();
</span><del>- if (structure->putWillGrowOutOfLineStorage())
- newButterfly = growOutOfLineStorage(vm, structure->outOfLineCapacity(), structure->suggestedNewOutOfLineStorageCapacity());
- offset = structure->addPropertyWithoutTransition(vm, propertyName, attributes, specificFunction);
- setStructureAndButterfly(vm, structure, newButterfly);
</del><ins>+ if (this->structure()->putWillGrowOutOfLineStorage())
+ newButterfly = growOutOfLineStorage(vm, this->structure()->outOfLineCapacity(), this->structure()->suggestedNewOutOfLineStorageCapacity());
+ offset = this->structure()->addPropertyWithoutTransition(vm, propertyName, attributes, specificFunction);
+ setStructureAndButterfly(vm, this->structure(), newButterfly);
</ins><span class="cx">
</span><span class="cx"> validateOffset(offset);
</span><del>- ASSERT(structure->isValidOffset(offset));
</del><ins>+ ASSERT(this->structure()->isValidOffset(offset));
</ins><span class="cx"> putDirect(vm, offset, value);
</span><span class="cx"> // See comment on setNewProperty call below.
</span><span class="cx"> if (!specificFunction)
</span><span class="cx"> slot.setNewProperty(this, offset);
</span><span class="cx"> if (attributes & ReadOnly)
</span><del>- structure->setContainsReadOnlyProperties();
</del><ins>+ this->structure()->setContainsReadOnlyProperties();
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PropertyOffset offset;
</span><del>- size_t currentCapacity = structure->outOfLineCapacity();
- if (Structure* newStructure = Structure::addPropertyTransitionToExistingStructure(structure, propertyName, attributes, specificFunction, offset)) {
</del><ins>+ size_t currentCapacity = this->structure()->outOfLineCapacity();
+ if (Structure* structure = Structure::addPropertyTransitionToExistingStructure(this->structure(), propertyName, attributes, specificFunction, offset)) {
</ins><span class="cx"> DeferGC deferGC(vm.heap);
</span><span class="cx"> Butterfly* newButterfly = butterfly();
</span><del>- if (currentCapacity != newStructure->outOfLineCapacity()) {
- ASSERT(newStructure != structure);
- newButterfly = growOutOfLineStorage(vm, currentCapacity, newStructure->outOfLineCapacity());
</del><ins>+ if (currentCapacity != structure->outOfLineCapacity()) {
+ ASSERT(structure != this->structure());
+ newButterfly = growOutOfLineStorage(vm, currentCapacity, structure->outOfLineCapacity());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> validateOffset(offset);
</span><del>- ASSERT(newStructure->isValidOffset(offset));
- setStructureAndButterfly(vm, newStructure, newButterfly);
</del><ins>+ ASSERT(structure->isValidOffset(offset));
+ setStructureAndButterfly(vm, structure, newButterfly);
</ins><span class="cx"> putDirect(vm, offset, value);
</span><span class="cx"> // This is a new property; transitions with specific values are not currently cachable,
</span><span class="cx"> // so leave the slot in an uncachable state.
</span></span></pre>
</div>
</div>
</body>
</html>