<!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>[189596] 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/189596">189596</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2015-09-10 16:07:08 -0700 (Thu, 10 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Structure should be able to tell you if it had ever been a dictionary
https://bugs.webkit.org/show_bug.cgi?id=149047
Reviewed by Mark Lam.
Introduces the hasBeenDictionary flag to Structure, which tells you if this structure or
any of its ancestors is a dictionary. We already implicitly tracked this for DFG
watchpoint optimizations, so this is mainly just decoupling that existing logic from
watchpoints. Having Structure::hasBeenDictionary() enables some of the heuristics in the
property type inference work (https://bugs.webkit.org/show_bug.cgi?id=148610).
* runtime/Structure.cpp:
(JSC::Structure::Structure):
(JSC::Structure::toDictionaryTransition):
(JSC::Structure::dump):
* runtime/Structure.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeStructurecpp">trunk/Source/JavaScriptCore/runtime/Structure.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeStructureh">trunk/Source/JavaScriptCore/runtime/Structure.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (189595 => 189596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-09-10 22:59:08 UTC (rev 189595)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-09-10 23:07:08 UTC (rev 189596)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-09-10 Filip Pizlo <fpizlo@apple.com>
+
+ Structure should be able to tell you if it had ever been a dictionary
+ https://bugs.webkit.org/show_bug.cgi?id=149047
+
+ Reviewed by Mark Lam.
+
+ Introduces the hasBeenDictionary flag to Structure, which tells you if this structure or
+ any of its ancestors is a dictionary. We already implicitly tracked this for DFG
+ watchpoint optimizations, so this is mainly just decoupling that existing logic from
+ watchpoints. Having Structure::hasBeenDictionary() enables some of the heuristics in the
+ property type inference work (https://bugs.webkit.org/show_bug.cgi?id=148610).
+
+ * runtime/Structure.cpp:
+ (JSC::Structure::Structure):
+ (JSC::Structure::toDictionaryTransition):
+ (JSC::Structure::dump):
+ * runtime/Structure.h:
+
</ins><span class="cx"> 2015-09-10 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, fix Windows file loading in JSC shell after r189583
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeStructurecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Structure.cpp (189595 => 189596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Structure.cpp 2015-09-10 22:59:08 UTC (rev 189595)
+++ trunk/Source/JavaScriptCore/runtime/Structure.cpp 2015-09-10 23:07:08 UTC (rev 189596)
</span><span class="lines">@@ -208,6 +208,7 @@
</span><span class="cx"> setStaticFunctionsReified(false);
</span><span class="cx"> setHasRareData(false);
</span><span class="cx"> setTransitionWatchpointIsLikelyToBeFired(false);
</span><ins>+ setHasBeenDictionary(false);
</ins><span class="cx">
</span><span class="cx"> ASSERT(inlineCapacity <= JSFinalObject::maxInlineCapacity());
</span><span class="cx"> ASSERT(static_cast<PropertyOffset>(inlineCapacity) < firstOutOfLineOffset);
</span><span class="lines">@@ -239,6 +240,7 @@
</span><span class="cx"> setStaticFunctionsReified(false);
</span><span class="cx"> setHasRareData(false);
</span><span class="cx"> setTransitionWatchpointIsLikelyToBeFired(false);
</span><ins>+ setHasBeenDictionary(false);
</ins><span class="cx">
</span><span class="cx"> TypeInfo typeInfo = TypeInfo(CellType, StructureFlags);
</span><span class="cx"> m_blob = StructureIDBlob(vm.heap.structureIDTable().allocateID(this), 0, typeInfo);
</span><span class="lines">@@ -268,6 +270,7 @@
</span><span class="cx"> setDidTransition(true);
</span><span class="cx"> setStaticFunctionsReified(previous->staticFunctionsReified());
</span><span class="cx"> setHasRareData(false);
</span><ins>+ setHasBeenDictionary(previous->hasBeenDictionary());
</ins><span class="cx">
</span><span class="cx"> TypeInfo typeInfo = previous->typeInfo();
</span><span class="cx"> m_blob = StructureIDBlob(vm.heap.structureIDTable().allocateID(this), previous->indexingTypeIncludingHistory(), typeInfo);
</span><span class="lines">@@ -537,7 +540,7 @@
</span><span class="cx"> transition->m_offset = structure->m_offset;
</span><span class="cx"> transition->setDictionaryKind(kind);
</span><span class="cx"> transition->pin();
</span><del>- transition->setTransitionWatchpointIsLikelyToBeFired(true);
</del><ins>+ transition->setHasBeenDictionary(true);
</ins><span class="cx">
</span><span class="cx"> transition->checkOffsetConsistency();
</span><span class="cx"> return transition;
</span><span class="lines">@@ -1156,6 +1159,8 @@
</span><span class="cx">
</span><span class="cx"> switch (dictionaryKind()) {
</span><span class="cx"> case NoneDictionaryKind:
</span><ins>+ if (hasBeenDictionary())
+ out.print(", Has been dictionary");
</ins><span class="cx"> break;
</span><span class="cx"> case CachedDictionaryKind:
</span><span class="cx"> out.print(", Dictionary");
</span><span class="lines">@@ -1164,6 +1169,11 @@
</span><span class="cx"> out.print(", UncacheableDictionary");
</span><span class="cx"> break;
</span><span class="cx"> }
</span><ins>+
+ if (transitionWatchpointSetIsStillValid())
+ out.print(", Leaf");
+ else if (transitionWatchpointIsLikelyToBeFired())
+ out.print(", Shady leaf");
</ins><span class="cx">
</span><span class="cx"> out.print("]");
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeStructureh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Structure.h (189595 => 189596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Structure.h 2015-09-10 22:59:08 UTC (rev 189595)
+++ trunk/Source/JavaScriptCore/runtime/Structure.h 2015-09-10 23:07:08 UTC (rev 189596)
</span><span class="lines">@@ -429,9 +429,13 @@
</span><span class="cx">
</span><span class="cx"> // - We don't watch Structures that either decided not to be watched, or whose predecessors
</span><span class="cx"> // decided not to be watched. This happens either when a transition is fired while being
</span><del>- // watched, or if a dictionary transition occurs.
</del><ins>+ // watched.
</ins><span class="cx"> if (transitionWatchpointIsLikelyToBeFired())
</span><span class="cx"> return false;
</span><ins>+
+ // - Don't watch Structures that had been dictionaries.
+ if (hasBeenDictionary())
+ return false;
</ins><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -523,6 +527,7 @@
</span><span class="cx"> DEFINE_BITFIELD(bool, hasCustomGetterSetterProperties, HasCustomGetterSetterProperties, 1, 25);
</span><span class="cx"> DEFINE_BITFIELD(bool, didWatchInternalProperties, DidWatchInternalProperties, 1, 26);
</span><span class="cx"> DEFINE_BITFIELD(bool, transitionWatchpointIsLikelyToBeFired, TransitionWatchpointIsLikelyToBeFired, 1, 27);
</span><ins>+ DEFINE_BITFIELD(bool, hasBeenDictionary, HasBeenDictionary, 1, 28);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> friend class LLIntOffsetsExtractor;
</span></span></pre>
</div>
</div>
</body>
</html>