<!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>[177401] 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/177401">177401</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-12-16 15:08:24 -0800 (Tue, 16 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/177380">r177380</a>.
https://bugs.webkit.org/show_bug.cgi?id=139707
"Breaks js/regres/elidable-new-object-* tests" (Requested by
msaboff_ on #webkit).
Reverted changeset:
"Fixes operationPutByIdOptimizes such that they check that the
put didn't"
https://bugs.webkit.org/show_bug.cgi?id=139500
http://trac.webkit.org/changeset/177380</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITOperationscpp">trunk/Source/JavaScriptCore/jit/JITOperations.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitRepatchcpp">trunk/Source/JavaScriptCore/jit/Repatch.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitRepatchh">trunk/Source/JavaScriptCore/jit/Repatch.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestsstressputbyidbuildlistorderrecursejs">trunk/Source/JavaScriptCore/tests/stress/put-by-id-build-list-order-recurse.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (177400 => 177401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-12-16 23:07:07 UTC (rev 177400)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-12-16 23:08:24 UTC (rev 177401)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-12-16 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r177380.
+ https://bugs.webkit.org/show_bug.cgi?id=139707
+
+ "Breaks js/regres/elidable-new-object-* tests" (Requested by
+ msaboff_ on #webkit).
+
+ Reverted changeset:
+
+ "Fixes operationPutByIdOptimizes such that they check that the
+ put didn't"
+ https://bugs.webkit.org/show_bug.cgi?id=139500
+ http://trac.webkit.org/changeset/177380
+
</ins><span class="cx"> 2014-12-16 Matthew Mirman <mmirman@apple.com>
</span><span class="cx">
</span><span class="cx"> Fixes operationPutByIdOptimizes such that they check that the put didn't
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITOperationscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITOperations.cpp (177400 => 177401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITOperations.cpp 2014-12-16 23:07:07 UTC (rev 177400)
+++ trunk/Source/JavaScriptCore/jit/JITOperations.cpp 2014-12-16 23:08:24 UTC (rev 177401)
</span><span class="lines">@@ -273,15 +273,14 @@
</span><span class="cx"> JSValue value = JSValue::decode(encodedValue);
</span><span class="cx"> JSValue baseValue = JSValue::decode(encodedBase);
</span><span class="cx"> PutPropertySlot slot(baseValue, true, exec->codeBlock()->putByIdContext());
</span><del>-
- Structure* structure = baseValue.isCell() ? baseValue.asCell()->structure(*vm) : nullptr;
</del><ins>+
</ins><span class="cx"> baseValue.put(exec, ident, value, slot);
</span><span class="cx">
</span><span class="cx"> if (accessType != static_cast<AccessType>(stubInfo->accessType))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (stubInfo->seen)
</span><del>- repatchPutByID(exec, baseValue, structure, ident, slot, *stubInfo, NotDirect);
</del><ins>+ repatchPutByID(exec, baseValue, ident, slot, *stubInfo, NotDirect);
</ins><span class="cx"> else
</span><span class="cx"> stubInfo->seen = true;
</span><span class="cx"> }
</span><span class="lines">@@ -297,15 +296,14 @@
</span><span class="cx"> JSValue value = JSValue::decode(encodedValue);
</span><span class="cx"> JSValue baseValue = JSValue::decode(encodedBase);
</span><span class="cx"> PutPropertySlot slot(baseValue, false, exec->codeBlock()->putByIdContext());
</span><del>-
- Structure* structure = baseValue.isCell() ? baseValue.asCell()->structure(*vm) : nullptr;
</del><ins>+
</ins><span class="cx"> baseValue.put(exec, ident, value, slot);
</span><span class="cx">
</span><span class="cx"> if (accessType != static_cast<AccessType>(stubInfo->accessType))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (stubInfo->seen)
</span><del>- repatchPutByID(exec, baseValue, structure, ident, slot, *stubInfo, NotDirect);
</del><ins>+ repatchPutByID(exec, baseValue, ident, slot, *stubInfo, NotDirect);
</ins><span class="cx"> else
</span><span class="cx"> stubInfo->seen = true;
</span><span class="cx"> }
</span><span class="lines">@@ -322,14 +320,13 @@
</span><span class="cx"> JSObject* baseObject = asObject(JSValue::decode(encodedBase));
</span><span class="cx"> PutPropertySlot slot(baseObject, true, exec->codeBlock()->putByIdContext());
</span><span class="cx">
</span><del>- Structure* structure = baseObject->structure(*vm);
</del><span class="cx"> baseObject->putDirect(exec->vm(), ident, value, slot);
</span><span class="cx">
</span><span class="cx"> if (accessType != static_cast<AccessType>(stubInfo->accessType))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (stubInfo->seen)
</span><del>- repatchPutByID(exec, baseObject, structure, ident, slot, *stubInfo, Direct);
</del><ins>+ repatchPutByID(exec, baseObject, ident, slot, *stubInfo, Direct);
</ins><span class="cx"> else
</span><span class="cx"> stubInfo->seen = true;
</span><span class="cx"> }
</span><span class="lines">@@ -346,14 +343,13 @@
</span><span class="cx"> JSObject* baseObject = asObject(JSValue::decode(encodedBase));
</span><span class="cx"> PutPropertySlot slot(baseObject, false, exec->codeBlock()->putByIdContext());
</span><span class="cx">
</span><del>- Structure* structure = baseObject->structure(*vm);
</del><span class="cx"> baseObject->putDirect(exec->vm(), ident, value, slot);
</span><span class="cx">
</span><span class="cx"> if (accessType != static_cast<AccessType>(stubInfo->accessType))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (stubInfo->seen)
</span><del>- repatchPutByID(exec, baseObject, structure, ident, slot, *stubInfo, Direct);
</del><ins>+ repatchPutByID(exec, baseObject, ident, slot, *stubInfo, Direct);
</ins><span class="cx"> else
</span><span class="cx"> stubInfo->seen = true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitRepatchcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/Repatch.cpp (177400 => 177401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/Repatch.cpp 2014-12-16 23:07:07 UTC (rev 177400)
+++ trunk/Source/JavaScriptCore/jit/Repatch.cpp 2014-12-16 23:08:24 UTC (rev 177401)
</span><span class="lines">@@ -1224,7 +1224,7 @@
</span><span class="cx"> structure);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static InlineCacheAction tryCachePutByID(ExecState* exec, JSValue baseValue, Structure* structure, const Identifier& ident, const PutPropertySlot& slot, StructureStubInfo& stubInfo, PutKind putKind)
</del><ins>+static InlineCacheAction tryCachePutByID(ExecState* exec, JSValue baseValue, const Identifier& ident, const PutPropertySlot& slot, StructureStubInfo& stubInfo, PutKind putKind)
</ins><span class="cx"> {
</span><span class="cx"> if (Options::forceICFailure())
</span><span class="cx"> return GiveUpOnCache;
</span><span class="lines">@@ -1235,10 +1235,7 @@
</span><span class="cx"> if (!baseValue.isCell())
</span><span class="cx"> return GiveUpOnCache;
</span><span class="cx"> JSCell* baseCell = baseValue.asCell();
</span><del>-
- if (baseCell->structure(*vm)->id() != structure->id())
- return GiveUpOnCache;
-
</del><ins>+ Structure* structure = baseCell->structure(*vm);
</ins><span class="cx"> Structure* oldStructure = structure->previousID();
</span><span class="cx">
</span><span class="cx"> if (!slot.isCacheablePut() && !slot.isCacheableCustom() && !slot.isCacheableSetter())
</span><span class="lines">@@ -1336,11 +1333,11 @@
</span><span class="cx"> return GiveUpOnCache;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void repatchPutByID(ExecState* exec, JSValue baseValue, Structure* structure, const Identifier& propertyName, const PutPropertySlot& slot, StructureStubInfo& stubInfo, PutKind putKind)
</del><ins>+void repatchPutByID(ExecState* exec, JSValue baseValue, const Identifier& propertyName, const PutPropertySlot& slot, StructureStubInfo& stubInfo, PutKind putKind)
</ins><span class="cx"> {
</span><span class="cx"> GCSafeConcurrentJITLocker locker(exec->codeBlock()->m_lock, exec->vm().heap);
</span><span class="cx">
</span><del>- if (tryCachePutByID(exec, baseValue, structure, propertyName, slot, stubInfo, putKind) == GiveUpOnCache)
</del><ins>+ if (tryCachePutByID(exec, baseValue, propertyName, slot, stubInfo, putKind) == GiveUpOnCache)
</ins><span class="cx"> repatchCall(exec->codeBlock(), stubInfo.callReturnLocation, appropriateGenericPutByIdFunction(slot, putKind));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitRepatchh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/Repatch.h (177400 => 177401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/Repatch.h 2014-12-16 23:07:07 UTC (rev 177400)
+++ trunk/Source/JavaScriptCore/jit/Repatch.h 2014-12-16 23:08:24 UTC (rev 177401)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> void repatchGetByID(ExecState*, JSValue, const Identifier&, const PropertySlot&, StructureStubInfo&);
</span><span class="cx"> void buildGetByIDList(ExecState*, JSValue, const Identifier&, const PropertySlot&, StructureStubInfo&);
</span><span class="cx"> void buildGetByIDProtoList(ExecState*, JSValue, const Identifier&, const PropertySlot&, StructureStubInfo&);
</span><del>-void repatchPutByID(ExecState*, JSValue, Structure*, const Identifier&, const PutPropertySlot&, StructureStubInfo&, PutKind);
</del><ins>+void repatchPutByID(ExecState*, JSValue, const Identifier&, const PutPropertySlot&, StructureStubInfo&, PutKind);
</ins><span class="cx"> void buildPutByIdList(ExecState*, JSValue, Structure*, const Identifier&, const PutPropertySlot&, StructureStubInfo&, PutKind);
</span><span class="cx"> void repatchIn(ExecState*, JSCell*, const Identifier&, bool wasFound, const PropertySlot&, StructureStubInfo&);
</span><span class="cx"> void linkFor(ExecState*, CallLinkInfo&, CodeBlock*, JSFunction* callee, MacroAssemblerCodePtr, CodeSpecializationKind, RegisterPreservationMode);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressputbyidbuildlistorderrecursejs"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/tests/stress/put-by-id-build-list-order-recurse.js (177400 => 177401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/put-by-id-build-list-order-recurse.js 2014-12-16 23:07:07 UTC (rev 177400)
+++ trunk/Source/JavaScriptCore/tests/stress/put-by-id-build-list-order-recurse.js 2014-12-16 23:08:24 UTC (rev 177401)
</span><span class="lines">@@ -1,35 +0,0 @@
</span><del>-var count = 0;
-
-function setter(value) {
- Object.defineProperty(
- this, "f", {
- enumerable: true,
- configurable: true,
- writable: true,
- value: 32
- });
- var o = Object.create(this);
- var currentCount = count++;
- var str = "for (var i = " + currentCount + "; i < " + (100 + currentCount) + "; ++i)\n"
- + " o.f\n";
- eval(str);
-}
-
-function foo(o) {
- o.f = 42;
-}
-
-noInline(foo);
-
-for (var i = 0; i < 1000; ++i) {
- var o = {};
- o.__defineSetter__("f", setter);
-
- foo(o);
- if (o.f != 32)
- throw ("Error 1: "+o.f);
-
- foo(o);
- if (o.f != 42)
- throw ("Error 2: "+o.f);
-}
</del><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>