<!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>[178336] releases/WebKitGTK/webkit-2.6/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/178336">178336</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-01-13 01:46:43 -0800 (Tue, 13 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/177083">r177083</a> - Fixes operationPutByIds such that they check that the put didn't
change the structure of the object who's property access is being
cached.
https://bugs.webkit.org/show_bug.cgi?id=139196
Reviewed by Filip Pizlo.
* jit/JITOperations.cpp:
(JSC::operationGetByIdOptimize): changed get to getPropertySlot
(JSC::operationPutByIdStrictBuildList): saved the structure before the put.
(JSC::operationPutByIdNonStrictBuildList): ditto.
(JSC::operationPutByIdDirectStrictBuildList): ditto.
(JSC::operationPutByIdDirectNonStrictBuildList): ditto.
* jit/Repatch.cpp:
(JSC::tryCachePutByID): fixed structure() to use the existant vm.
(JSC::tryBuildPutByIdList): Added a check that the old structure's id
is the same as the new.
(JSC::buildPutByIdList): Added an argument
* jit/Repatch.h:
(JSC::buildPutByIdList): Added an argument
* tests/stress/put-by-id-strict-build-list-order.js: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26SourceJavaScriptCoreChangeLog">releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceJavaScriptCorejitJITOperationscpp">releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/jit/JITOperations.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceJavaScriptCorejitRepatchcpp">releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/jit/Repatch.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceJavaScriptCorejitRepatchh">releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/jit/Repatch.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26SourceJavaScriptCoretestsstressputbyidstrictbuildlistorderjs">releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/tests/stress/put-by-id-strict-build-list-order.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit26SourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/ChangeLog (178335 => 178336)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/ChangeLog 2015-01-13 09:43:04 UTC (rev 178335)
+++ releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/ChangeLog 2015-01-13 09:46:43 UTC (rev 178336)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-12-10 Matthew Mirman <mmirman@apple.com>
+
+ Fixes operationPutByIds such that they check that the put didn't
+ change the structure of the object who's property access is being
+ cached.
+ https://bugs.webkit.org/show_bug.cgi?id=139196
+
+ Reviewed by Filip Pizlo.
+
+ * jit/JITOperations.cpp:
+ (JSC::operationGetByIdOptimize): changed get to getPropertySlot
+ (JSC::operationPutByIdStrictBuildList): saved the structure before the put.
+ (JSC::operationPutByIdNonStrictBuildList): ditto.
+ (JSC::operationPutByIdDirectStrictBuildList): ditto.
+ (JSC::operationPutByIdDirectNonStrictBuildList): ditto.
+ * jit/Repatch.cpp:
+ (JSC::tryCachePutByID): fixed structure() to use the existant vm.
+ (JSC::tryBuildPutByIdList): Added a check that the old structure's id
+ is the same as the new.
+ (JSC::buildPutByIdList): Added an argument
+ * jit/Repatch.h:
+ (JSC::buildPutByIdList): Added an argument
+ * tests/stress/put-by-id-strict-build-list-order.js: Added.
+
</ins><span class="cx"> 2014-12-08 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> CFA wrongly assumes that a speculation for SlowPutArrayStorageShape disallows ArrayStorageShape arrays.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceJavaScriptCorejitJITOperationscpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/jit/JITOperations.cpp (178335 => 178336)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/jit/JITOperations.cpp 2015-01-13 09:43:04 UTC (rev 178335)
+++ releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/jit/JITOperations.cpp 2015-01-13 09:46:43 UTC (rev 178336)
</span><span class="lines">@@ -163,14 +163,15 @@
</span><span class="cx">
</span><span class="cx"> JSValue baseValue = JSValue::decode(base);
</span><span class="cx"> PropertySlot slot(baseValue);
</span><del>- JSValue result = baseValue.get(exec, ident, slot);
</del><span class="cx">
</span><ins>+ bool hasResult = baseValue.getPropertySlot(exec, ident, slot);
</ins><span class="cx"> if (stubInfo->seen)
</span><span class="cx"> repatchGetByID(exec, baseValue, ident, slot, *stubInfo);
</span><span class="cx"> else
</span><span class="cx"> stubInfo->seen = true;
</span><ins>+
+ return JSValue::encode(hasResult? slot.getValue(exec, ident) : jsUndefined());
</ins><span class="cx">
</span><del>- return JSValue::encode(result);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JIT_OPERATION operationInOptimize(ExecState* exec, StructureStubInfo* stubInfo, JSCell* base, StringImpl* key)
</span><span class="lines">@@ -365,12 +366,13 @@
</span><span class="cx"> JSValue baseValue = JSValue::decode(encodedBase);
</span><span class="cx"> PutPropertySlot slot(baseValue, true, exec->codeBlock()->putByIdContext());
</span><span class="cx">
</span><ins>+ Structure* structure = baseValue.isCell() ? baseValue.asCell()->structure(*vm) : nullptr;
</ins><span class="cx"> baseValue.put(exec, ident, value, slot);
</span><del>-
</del><ins>+
</ins><span class="cx"> if (accessType != static_cast<AccessType>(stubInfo->accessType))
</span><span class="cx"> return;
</span><del>-
- buildPutByIdList(exec, baseValue, ident, slot, *stubInfo, NotDirect);
</del><ins>+
+ buildPutByIdList(exec, baseValue, structure, ident, slot, *stubInfo, NotDirect);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JIT_OPERATION operationPutByIdNonStrictBuildList(ExecState* exec, StructureStubInfo* stubInfo, EncodedJSValue encodedValue, EncodedJSValue encodedBase, StringImpl* uid)
</span><span class="lines">@@ -384,13 +386,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>-
</del><ins>+
+ Structure* structure = baseValue.isCell() ? baseValue.asCell()->structure(*vm) : nullptr;
</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><del>- buildPutByIdList(exec, baseValue, ident, slot, *stubInfo, NotDirect);
</del><ins>+ buildPutByIdList(exec, baseValue, structure, ident, slot, *stubInfo, NotDirect);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JIT_OPERATION operationPutByIdDirectStrictBuildList(ExecState* exec, StructureStubInfo* stubInfo, EncodedJSValue encodedValue, EncodedJSValue encodedBase, StringImpl* uid)
</span><span class="lines">@@ -404,13 +407,14 @@
</span><span class="cx"> JSValue value = JSValue::decode(encodedValue);
</span><span class="cx"> JSObject* baseObject = asObject(JSValue::decode(encodedBase));
</span><span class="cx"> PutPropertySlot slot(baseObject, true, exec->codeBlock()->putByIdContext());
</span><ins>+
+ Structure* structure = baseObject->structure(*vm);
+ baseObject->putDirect(*vm, ident, value, slot);
</ins><span class="cx">
</span><del>- baseObject->putDirect(exec->vm(), ident, value, slot);
-
</del><span class="cx"> if (accessType != static_cast<AccessType>(stubInfo->accessType))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- buildPutByIdList(exec, baseObject, ident, slot, *stubInfo, Direct);
</del><ins>+ buildPutByIdList(exec, baseObject, structure, ident, slot, *stubInfo, Direct);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JIT_OPERATION operationPutByIdDirectNonStrictBuildList(ExecState* exec, StructureStubInfo* stubInfo, EncodedJSValue encodedValue, EncodedJSValue encodedBase, StringImpl* uid)
</span><span class="lines">@@ -424,13 +428,14 @@
</span><span class="cx"> JSValue value = JSValue::decode(encodedValue);
</span><span class="cx"> JSObject* baseObject = asObject(JSValue::decode(encodedBase));
</span><span class="cx"> PutPropertySlot slot(baseObject, false, exec->codeBlock()->putByIdContext());
</span><del>-
- baseObject ->putDirect(exec->vm(), ident, value, slot);
-
</del><ins>+
+ Structure* structure = baseObject->structure(*vm);
+ baseObject->putDirect(*vm, ident, value, slot);
+
</ins><span class="cx"> if (accessType != static_cast<AccessType>(stubInfo->accessType))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- buildPutByIdList(exec, baseObject, ident, slot, *stubInfo, Direct);
</del><ins>+ buildPutByIdList(exec, baseObject, structure, ident, slot, *stubInfo, Direct);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JIT_OPERATION operationReallocateStorageAndFinishPut(ExecState* exec, JSObject* base, Structure* structure, PropertyOffset offset, EncodedJSValue value)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceJavaScriptCorejitRepatchcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/jit/Repatch.cpp (178335 => 178336)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/jit/Repatch.cpp 2015-01-13 09:43:04 UTC (rev 178335)
+++ releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/jit/Repatch.cpp 2015-01-13 09:46:43 UTC (rev 178336)
</span><span class="lines">@@ -1182,7 +1182,7 @@
</span><span class="cx"> if (!baseValue.isCell())
</span><span class="cx"> return GiveUpOnCache;
</span><span class="cx"> JSCell* baseCell = baseValue.asCell();
</span><del>- Structure* structure = baseCell->structure();
</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">@@ -1288,15 +1288,18 @@
</span><span class="cx"> repatchCall(exec->codeBlock(), stubInfo.callReturnLocation, appropriateGenericPutByIdFunction(slot, putKind));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static InlineCacheAction tryBuildPutByIdList(ExecState* exec, JSValue baseValue, const Identifier& propertyName, const PutPropertySlot& slot, StructureStubInfo& stubInfo, PutKind putKind)
</del><ins>+static InlineCacheAction tryBuildPutByIdList(ExecState* exec, JSValue baseValue, Structure* structure, const Identifier& propertyName, const PutPropertySlot& slot, StructureStubInfo& stubInfo, PutKind putKind)
</ins><span class="cx"> {
</span><span class="cx"> CodeBlock* codeBlock = exec->codeBlock();
</span><span class="cx"> VM* vm = &exec->vm();
</span><span class="cx">
</span><del>- if (!baseValue.isCell())
</del><ins>+ if (!baseValue.isCell() || !structure)
</ins><span class="cx"> return GiveUpOnCache;
</span><span class="cx"> JSCell* baseCell = baseValue.asCell();
</span><del>- Structure* structure = baseCell->structure();
</del><ins>+
+ if (baseCell->structure(*vm)->id() != structure->id())
+ return GiveUpOnCache;
+
</ins><span class="cx"> Structure* oldStructure = structure->previousID();
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -1413,11 +1416,11 @@
</span><span class="cx"> return GiveUpOnCache;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void buildPutByIdList(ExecState* exec, JSValue baseValue, const Identifier& propertyName, const PutPropertySlot& slot, StructureStubInfo& stubInfo, PutKind putKind)
</del><ins>+void buildPutByIdList(ExecState* exec, JSValue baseValue, Structure* structure, 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 (tryBuildPutByIdList(exec, baseValue, propertyName, slot, stubInfo, putKind) == GiveUpOnCache)
</del><ins>+ if (tryBuildPutByIdList(exec, baseValue, structure, 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="releasesWebKitGTKwebkit26SourceJavaScriptCorejitRepatchh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/jit/Repatch.h (178335 => 178336)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/jit/Repatch.h 2015-01-13 09:43:04 UTC (rev 178335)
+++ releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/jit/Repatch.h 2015-01-13 09:46:43 UTC (rev 178336)
</span><span class="lines">@@ -37,7 +37,7 @@
</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><span class="cx"> void repatchPutByID(ExecState*, JSValue, const Identifier&, const PutPropertySlot&, StructureStubInfo&, PutKind);
</span><del>-void buildPutByIdList(ExecState*, JSValue, const Identifier&, const PutPropertySlot&, StructureStubInfo&, PutKind);
</del><ins>+void buildPutByIdList(ExecState*, JSValue, Structure*, const Identifier&, const PutPropertySlot&, StructureStubInfo&, PutKind);
</ins><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 class="cx"> void linkSlowFor(ExecState*, CallLinkInfo&, CodeSpecializationKind, RegisterPreservationMode);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceJavaScriptCoretestsstressputbyidstrictbuildlistorderjs"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/tests/stress/put-by-id-strict-build-list-order.js (0 => 178336)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/tests/stress/put-by-id-strict-build-list-order.js (rev 0)
+++ releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/tests/stress/put-by-id-strict-build-list-order.js 2015-01-13 09:46:43 UTC (rev 178336)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+function foo(o) {
+ "use strict";
+ o.f = 42;
+}
+
+noInline(foo);
+
+var a = {};
+foo(a);
+foo(a);
+a = {f : 3};
+foo(a);
+
+var b = {};
+foo(b);
+foo(b);
</ins></span></pre>
</div>
</div>
</body>
</html>