<!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>[189309] branches/safari-601-branch/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/189309">189309</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-09-03 16:08:39 -0700 (Thu, 03 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/188067">r188067</a>. rdar://problem/22423285</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchSourceJavaScriptCoreChangeLog">branches/safari-601-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceJavaScriptCoredfgDFGGraphcpp">branches/safari-601-branch/Source/JavaScriptCore/dfg/DFGGraph.cpp</a></li>
<li><a href="#branchessafari601branchSourceJavaScriptCoredfgDFGGraphh">branches/safari-601-branch/Source/JavaScriptCore/dfg/DFGGraph.h</a></li>
<li><a href="#branchessafari601branchSourceJavaScriptCoredfgDFGStructureRegistrationPhasecpp">branches/safari-601-branch/Source/JavaScriptCore/dfg/DFGStructureRegistrationPhase.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/JavaScriptCore/ChangeLog (189308 => 189309)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/JavaScriptCore/ChangeLog 2015-09-03 23:06:27 UTC (rev 189308)
+++ branches/safari-601-branch/Source/JavaScriptCore/ChangeLog 2015-09-03 23:08:39 UTC (rev 189309)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2015-09-03 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r188067.
+
+ 2015-08-06 Filip Pizlo <fpizlo@apple.com>
+
+ Structures used for tryGetConstantProperty() should be registered first
+ https://bugs.webkit.org/show_bug.cgi?id=147750
+
+ Reviewed by Saam Barati and Michael Saboff.
+
+ * dfg/DFGGraph.cpp:
+ (JSC::DFG::Graph::tryGetConstantProperty): Add an assertion to that effect. This should catch the bug sooner.
+ * dfg/DFGGraph.h:
+ (JSC::DFG::Graph::addStructureSet): Register structures when we make a structure set. That ensures that we won't call tryGetConstantProperty() on a structure that hasn't been registered yet.
+ * dfg/DFGStructureRegistrationPhase.cpp:
+ (JSC::DFG::StructureRegistrationPhase::run): Don't register structure sets here anymore. Registering them before we get here means there is no chance of the code being DCE'd before the structures get registered. It also enables the tryGetConstantProperty() assertion, since that code runs before StructureRegisterationPhase.
+ (JSC::DFG::StructureRegistrationPhase::registerStructures):
+ (JSC::DFG::StructureRegistrationPhase::registerStructure):
+ (JSC::DFG::StructureRegistrationPhase::assertAreRegistered):
+ (JSC::DFG::StructureRegistrationPhase::assertIsRegistered):
+ (JSC::DFG::performStructureRegistration):
+
</ins><span class="cx"> 2015-08-27 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r189012. rdar://problem/22084478
</span></span></pre></div>
<a id="branchessafari601branchSourceJavaScriptCoredfgDFGGraphcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/JavaScriptCore/dfg/DFGGraph.cpp (189308 => 189309)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/JavaScriptCore/dfg/DFGGraph.cpp 2015-09-03 23:06:27 UTC (rev 189308)
+++ branches/safari-601-branch/Source/JavaScriptCore/dfg/DFGGraph.cpp 2015-09-03 23:08:39 UTC (rev 189309)
</span><span class="lines">@@ -976,6 +976,8 @@
</span><span class="cx">
</span><span class="cx"> for (unsigned i = structureSet.size(); i--;) {
</span><span class="cx"> Structure* structure = structureSet[i];
</span><ins>+ assertIsRegistered(structure);
+
</ins><span class="cx"> WatchpointSet* set = structure->propertyReplacementWatchpointSet(offset);
</span><span class="cx"> if (!set || !set->isStillValid())
</span><span class="cx"> return JSValue();
</span></span></pre></div>
<a id="branchessafari601branchSourceJavaScriptCoredfgDFGGraphh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/JavaScriptCore/dfg/DFGGraph.h (189308 => 189309)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/JavaScriptCore/dfg/DFGGraph.h 2015-09-03 23:06:27 UTC (rev 189308)
+++ branches/safari-601-branch/Source/JavaScriptCore/dfg/DFGGraph.h 2015-09-03 23:08:39 UTC (rev 189309)
</span><span class="lines">@@ -326,6 +326,8 @@
</span><span class="cx"> StructureSet* addStructureSet(const StructureSet& structureSet)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(structureSet.size());
</span><ins>+ for (Structure* structure : structureSet)
+ registerStructure(structure);
</ins><span class="cx"> m_structureSet.append(structureSet);
</span><span class="cx"> return &m_structureSet.last();
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari601branchSourceJavaScriptCoredfgDFGStructureRegistrationPhasecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/JavaScriptCore/dfg/DFGStructureRegistrationPhase.cpp (189308 => 189309)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/JavaScriptCore/dfg/DFGStructureRegistrationPhase.cpp 2015-09-03 23:06:27 UTC (rev 189308)
+++ branches/safari-601-branch/Source/JavaScriptCore/dfg/DFGStructureRegistrationPhase.cpp 2015-09-03 23:08:39 UTC (rev 189309)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> registerStructure(m_graph.m_vm.getterSetterStructure.get());
</span><span class="cx">
</span><span class="cx"> for (FrozenValue* value : m_graph.m_frozenValues)
</span><del>- m_graph.assertIsRegistered(value->structure());
</del><ins>+ assertIsRegistered(value->structure());
</ins><span class="cx">
</span><span class="cx"> for (BlockIndex blockIndex = m_graph.numBlocks(); blockIndex--;) {
</span><span class="cx"> BasicBlock* block = m_graph.block(blockIndex);
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx">
</span><span class="cx"> switch (node->op()) {
</span><span class="cx"> case CheckStructure:
</span><del>- registerStructures(node->structureSet());
</del><ins>+ assertAreRegistered(node->structureSet());
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case NewObject:
</span><span class="lines">@@ -152,8 +152,8 @@
</span><span class="cx"> private:
</span><span class="cx"> void registerStructures(const StructureSet& set)
</span><span class="cx"> {
</span><del>- for (unsigned i = set.size(); i--;)
- registerStructure(set[i]);
</del><ins>+ for (Structure* structure : set)
+ registerStructure(structure);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void registerStructure(Structure* structure)
</span><span class="lines">@@ -161,6 +161,18 @@
</span><span class="cx"> if (structure)
</span><span class="cx"> m_graph.registerStructure(structure);
</span><span class="cx"> }
</span><ins>+
+ void assertAreRegistered(const StructureSet& set)
+ {
+ for (Structure* structure : set)
+ assertIsRegistered(structure);
+ }
+
+ void assertIsRegistered(Structure* structure)
+ {
+ if (structure)
+ m_graph.assertIsRegistered(structure);
+ }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> bool performStructureRegistration(Graph& graph)
</span></span></pre>
</div>
</div>
</body>
</html>