<!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>[173279] trunk/Source</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/173279">173279</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2014-09-04 14:08:38 -0700 (Thu, 04 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Beef up the DFG's CFG analyses to include iterated dominance frontiers and more user-friendly BlockSets
https://bugs.webkit.org/show_bug.cgi?id=136520
Reviewed by Geoffrey Garen.
Source/JavaScriptCore:
Add code to compute iterated dominance frontiers. This involves using BlockSet a lot, so
this patch also makes BlockSet a lot more user-friendly.
* CMakeLists.txt:
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
* JavaScriptCore.xcodeproj/project.pbxproj:
* dfg/DFGBasicBlock.h:
* dfg/DFGBlockSet.cpp: Added.
(JSC::DFG::BlockSet::dump):
* dfg/DFGBlockSet.h:
(JSC::DFG::BlockSet::iterator::iterator):
(JSC::DFG::BlockSet::iterator::operator++):
(JSC::DFG::BlockSet::iterator::operator==):
(JSC::DFG::BlockSet::iterator::operator!=):
(JSC::DFG::BlockSet::Iterable::Iterable):
(JSC::DFG::BlockSet::Iterable::begin):
(JSC::DFG::BlockSet::Iterable::end):
(JSC::DFG::BlockSet::iterable):
(JSC::DFG::BlockAdder::BlockAdder):
(JSC::DFG::BlockAdder::operator()):
* dfg/DFGBlockSetInlines.h: Added.
(JSC::DFG::BlockSet::iterator::operator*):
* dfg/DFGDominators.cpp:
(JSC::DFG::Dominators::strictDominatorsOf):
(JSC::DFG::Dominators::dominatorsOf):
(JSC::DFG::Dominators::blocksStrictlyDominatedBy):
(JSC::DFG::Dominators::blocksDominatedBy):
(JSC::DFG::Dominators::dominanceFrontierOf):
(JSC::DFG::Dominators::iteratedDominanceFrontierOf):
* dfg/DFGDominators.h:
(JSC::DFG::Dominators::forAllStrictDominatorsOf):
(JSC::DFG::Dominators::forAllDominatorsOf):
(JSC::DFG::Dominators::forAllBlocksStrictlyDominatedBy):
(JSC::DFG::Dominators::forAllBlocksDominatedBy):
(JSC::DFG::Dominators::forAllBlocksInDominanceFrontierOf):
(JSC::DFG::Dominators::forAllBlocksInIteratedDominanceFrontierOf):
(JSC::DFG::Dominators::forAllBlocksInDominanceFrontierOfImpl):
(JSC::DFG::Dominators::forAllBlocksInIteratedDominanceFrontierOfImpl):
* dfg/DFGGraph.cpp:
(JSC::DFG::Graph::dumpBlockHeader):
* dfg/DFGInvalidationPointInjectionPhase.cpp:
(JSC::DFG::InvalidationPointInjectionPhase::run):
Source/WTF:
Give BitVector a way to quickly find the next set (or unset) bit. Make BitVector equality
faster. Fix a minor closure goof in Spectrum.
* wtf/BitVector.cpp:
(WTF::BitVector::equalsSlowCase):
(WTF::BitVector::equalsSlowCaseFast):
(WTF::BitVector::equalsSlowCaseSimple):
* wtf/BitVector.h:
(WTF::BitVector::findBit):
(WTF::BitVector::findBitFast):
(WTF::BitVector::findBitSimple):
(WTF::BitVector::findBitInWord):
* wtf/Spectrum.h:
(WTF::Spectrum::removeIf):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreCMakeListstxt">trunk/Source/JavaScriptCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxproj">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj">trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGBasicBlockh">trunk/Source/JavaScriptCore/dfg/DFGBasicBlock.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGBlockSeth">trunk/Source/JavaScriptCore/dfg/DFGBlockSet.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGDominatorscpp">trunk/Source/JavaScriptCore/dfg/DFGDominators.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGDominatorsh">trunk/Source/JavaScriptCore/dfg/DFGDominators.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGGraphcpp">trunk/Source/JavaScriptCore/dfg/DFGGraph.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGInvalidationPointInjectionPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGInvalidationPointInjectionPhase.cpp</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfBitVectorcpp">trunk/Source/WTF/wtf/BitVector.cpp</a></li>
<li><a href="#trunkSourceWTFwtfBitVectorh">trunk/Source/WTF/wtf/BitVector.h</a></li>
<li><a href="#trunkSourceWTFwtfSpectrumh">trunk/Source/WTF/wtf/Spectrum.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoredfgDFGBlockSetcpp">trunk/Source/JavaScriptCore/dfg/DFGBlockSet.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGBlockSetInlinesh">trunk/Source/JavaScriptCore/dfg/DFGBlockSetInlines.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/CMakeLists.txt (173278 => 173279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/CMakeLists.txt 2014-09-04 21:07:00 UTC (rev 173278)
+++ trunk/Source/JavaScriptCore/CMakeLists.txt 2014-09-04 21:08:38 UTC (rev 173279)
</span><span class="lines">@@ -126,6 +126,7 @@
</span><span class="cx"> dfg/DFGBasicBlock.cpp
</span><span class="cx"> dfg/DFGBinarySwitch.cpp
</span><span class="cx"> dfg/DFGBlockInsertionSet.cpp
</span><ins>+ dfg/DFGBlockSet.cpp
</ins><span class="cx"> dfg/DFGBlockWorklist.cpp
</span><span class="cx"> dfg/DFGByteCodeParser.cpp
</span><span class="cx"> dfg/DFGCFAPhase.cpp
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (173278 => 173279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-09-04 21:07:00 UTC (rev 173278)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-09-04 21:08:38 UTC (rev 173279)
</span><span class="lines">@@ -1,3 +1,53 @@
</span><ins>+2014-09-03 Filip Pizlo <fpizlo@apple.com>
+
+ Beef up the DFG's CFG analyses to include iterated dominance frontiers and more user-friendly BlockSets
+ https://bugs.webkit.org/show_bug.cgi?id=136520
+
+ Reviewed by Geoffrey Garen.
+
+ Add code to compute iterated dominance frontiers. This involves using BlockSet a lot, so
+ this patch also makes BlockSet a lot more user-friendly.
+
+ * CMakeLists.txt:
+ * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
+ * JavaScriptCore.xcodeproj/project.pbxproj:
+ * dfg/DFGBasicBlock.h:
+ * dfg/DFGBlockSet.cpp: Added.
+ (JSC::DFG::BlockSet::dump):
+ * dfg/DFGBlockSet.h:
+ (JSC::DFG::BlockSet::iterator::iterator):
+ (JSC::DFG::BlockSet::iterator::operator++):
+ (JSC::DFG::BlockSet::iterator::operator==):
+ (JSC::DFG::BlockSet::iterator::operator!=):
+ (JSC::DFG::BlockSet::Iterable::Iterable):
+ (JSC::DFG::BlockSet::Iterable::begin):
+ (JSC::DFG::BlockSet::Iterable::end):
+ (JSC::DFG::BlockSet::iterable):
+ (JSC::DFG::BlockAdder::BlockAdder):
+ (JSC::DFG::BlockAdder::operator()):
+ * dfg/DFGBlockSetInlines.h: Added.
+ (JSC::DFG::BlockSet::iterator::operator*):
+ * dfg/DFGDominators.cpp:
+ (JSC::DFG::Dominators::strictDominatorsOf):
+ (JSC::DFG::Dominators::dominatorsOf):
+ (JSC::DFG::Dominators::blocksStrictlyDominatedBy):
+ (JSC::DFG::Dominators::blocksDominatedBy):
+ (JSC::DFG::Dominators::dominanceFrontierOf):
+ (JSC::DFG::Dominators::iteratedDominanceFrontierOf):
+ * dfg/DFGDominators.h:
+ (JSC::DFG::Dominators::forAllStrictDominatorsOf):
+ (JSC::DFG::Dominators::forAllDominatorsOf):
+ (JSC::DFG::Dominators::forAllBlocksStrictlyDominatedBy):
+ (JSC::DFG::Dominators::forAllBlocksDominatedBy):
+ (JSC::DFG::Dominators::forAllBlocksInDominanceFrontierOf):
+ (JSC::DFG::Dominators::forAllBlocksInIteratedDominanceFrontierOf):
+ (JSC::DFG::Dominators::forAllBlocksInDominanceFrontierOfImpl):
+ (JSC::DFG::Dominators::forAllBlocksInIteratedDominanceFrontierOfImpl):
+ * dfg/DFGGraph.cpp:
+ (JSC::DFG::Graph::dumpBlockHeader):
+ * dfg/DFGInvalidationPointInjectionPhase.cpp:
+ (JSC::DFG::InvalidationPointInjectionPhase::run):
+
</ins><span class="cx"> 2014-09-04 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Fixed indentations and some style warnings in JavaScriptCore/runtime.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj (173278 => 173279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2014-09-04 21:07:00 UTC (rev 173278)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2014-09-04 21:08:38 UTC (rev 173279)
</span><span class="lines">@@ -372,6 +372,7 @@
</span><span class="cx"> <ClCompile Include="..\dfg\DFGBasicBlock.cpp" />
</span><span class="cx"> <ClCompile Include="..\dfg\DFGBinarySwitch.cpp" />
</span><span class="cx"> <ClCompile Include="..\dfg\DFGBlockInsertionSet.cpp" />
</span><ins>+ <ClCompile Include="..\dfg\DFGBlockSet.cpp" />
</ins><span class="cx"> <ClCompile Include="..\dfg\DFGBlockWorklist.cpp" />
</span><span class="cx"> <ClCompile Include="..\dfg\DFGByteCodeParser.cpp" />
</span><span class="cx"> <ClCompile Include="..\dfg\DFGCapabilities.cpp" />
</span><span class="lines">@@ -998,6 +999,7 @@
</span><span class="cx"> <ClInclude Include="..\dfg\DFGBlockMapInlines.h" />
</span><span class="cx"> <ClInclude Include="..\dfg\DFGBlockWorklist.h" />
</span><span class="cx"> <ClInclude Include="..\dfg\DFGBlockSet.h" />
</span><ins>+ <ClInclude Include="..\dfg\DFGBlockSetInlines.h" />
</ins><span class="cx"> <ClInclude Include="..\dfg\DFGBranchDirection.h" />
</span><span class="cx"> <ClInclude Include="..\dfg\DFGByteCodeParser.h" />
</span><span class="cx"> <ClInclude Include="..\dfg\DFGCallArrayAllocatorSlowPathGenerator.h" />
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (173278 => 173279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2014-09-04 21:07:00 UTC (rev 173278)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2014-09-04 21:08:38 UTC (rev 173279)
</span><span class="lines">@@ -481,6 +481,8 @@
</span><span class="cx"> 0FBE0F7516C1DB0B0082C5E8 /* DFGPredictionInjectionPhase.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FBE0F6E16C1DB010082C5E8 /* DFGPredictionInjectionPhase.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 0FBE0F7616C1DB0F0082C5E8 /* DFGUnificationPhase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FBE0F6F16C1DB010082C5E8 /* DFGUnificationPhase.cpp */; };
</span><span class="cx"> 0FBE0F7716C1DB120082C5E8 /* DFGUnificationPhase.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FBE0F7016C1DB010082C5E8 /* DFGUnificationPhase.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+ 0FBF158C19B7A53100695DD0 /* DFGBlockSet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FBF158A19B7A53100695DD0 /* DFGBlockSet.cpp */; };
+ 0FBF158D19B7A53100695DD0 /* DFGBlockSetInlines.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FBF158B19B7A53100695DD0 /* DFGBlockSetInlines.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 0FBFDD04196C92BF007A5BFA /* DFGPhantomRemovalPhase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FBFDD02196C92BF007A5BFA /* DFGPhantomRemovalPhase.cpp */; };
</span><span class="cx"> 0FBFDD05196C92BF007A5BFA /* DFGPhantomRemovalPhase.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FBFDD03196C92BF007A5BFA /* DFGPhantomRemovalPhase.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 0FC0976A1468A6F700CF2442 /* DFGOSRExit.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FC097681468A6EF00CF2442 /* DFGOSRExit.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -2405,6 +2407,8 @@
</span><span class="cx"> 0FBE0F6E16C1DB010082C5E8 /* DFGPredictionInjectionPhase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DFGPredictionInjectionPhase.h; path = dfg/DFGPredictionInjectionPhase.h; sourceTree = "<group>"; };
</span><span class="cx"> 0FBE0F6F16C1DB010082C5E8 /* DFGUnificationPhase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DFGUnificationPhase.cpp; path = dfg/DFGUnificationPhase.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0FBE0F7016C1DB010082C5E8 /* DFGUnificationPhase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DFGUnificationPhase.h; path = dfg/DFGUnificationPhase.h; sourceTree = "<group>"; };
</span><ins>+ 0FBF158A19B7A53100695DD0 /* DFGBlockSet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DFGBlockSet.cpp; path = dfg/DFGBlockSet.cpp; sourceTree = "<group>"; };
+ 0FBF158B19B7A53100695DD0 /* DFGBlockSetInlines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DFGBlockSetInlines.h; path = dfg/DFGBlockSetInlines.h; sourceTree = "<group>"; };
</ins><span class="cx"> 0FBFDD02196C92BF007A5BFA /* DFGPhantomRemovalPhase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DFGPhantomRemovalPhase.cpp; path = dfg/DFGPhantomRemovalPhase.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0FBFDD03196C92BF007A5BFA /* DFGPhantomRemovalPhase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DFGPhantomRemovalPhase.h; path = dfg/DFGPhantomRemovalPhase.h; sourceTree = "<group>"; };
</span><span class="cx"> 0FC097681468A6EF00CF2442 /* DFGOSRExit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DFGOSRExit.h; path = dfg/DFGOSRExit.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -4826,7 +4830,9 @@
</span><span class="cx"> A7D89CE517A0B8CC00773AD8 /* DFGBlockInsertionSet.h */,
</span><span class="cx"> 0FC3CCF519ADA410006AC72A /* DFGBlockMap.h */,
</span><span class="cx"> 0FC3CCF619ADA410006AC72A /* DFGBlockMapInlines.h */,
</span><ins>+ 0FBF158A19B7A53100695DD0 /* DFGBlockSet.cpp */,
</ins><span class="cx"> 0FC3CCF719ADA410006AC72A /* DFGBlockSet.h */,
</span><ins>+ 0FBF158B19B7A53100695DD0 /* DFGBlockSetInlines.h */,
</ins><span class="cx"> 0FC3CCF819ADA410006AC72A /* DFGBlockWorklist.cpp */,
</span><span class="cx"> 0FC3CCF919ADA410006AC72A /* DFGBlockWorklist.h */,
</span><span class="cx"> 0F8364B5164B0C0E0053329A /* DFGBranchDirection.h */,
</span><span class="lines">@@ -5919,6 +5925,7 @@
</span><span class="cx"> 0FD3C82814115D4F00FD81CB /* DFGDriver.h in Headers */,
</span><span class="cx"> 0F66E16C14DF3F1600B7B2E4 /* DFGEdge.h in Headers */,
</span><span class="cx"> A7D9A29617A0BC7400EE2618 /* DFGEdgeDominates.h in Headers */,
</span><ins>+ 0FBF158D19B7A53100695DD0 /* DFGBlockSetInlines.h in Headers */,
</ins><span class="cx"> A7986D5717A0BB1E00A95DD0 /* DFGEdgeUsesStructure.h in Headers */,
</span><span class="cx"> 0FBC0AE81496C7C700D4FBDD /* DFGExitProfile.h in Headers */,
</span><span class="cx"> A78A9775179738B8009DF744 /* DFGFailedFinalizer.h in Headers */,
</span><span class="lines">@@ -7414,6 +7421,7 @@
</span><span class="cx"> 0F13E04E16164A1F00DC8DE7 /* IndexingType.cpp in Sources */,
</span><span class="cx"> 0FCEFACA1805E75500472CE4 /* InitializeLLVM.cpp in Sources */,
</span><span class="cx"> A513E5B7185B8BD3007E95AD /* InjectedScript.cpp in Sources */,
</span><ins>+ 0FBF158C19B7A53100695DD0 /* DFGBlockSet.cpp in Sources */,
</ins><span class="cx"> A514B2C2185A684400F3C7CB /* InjectedScriptBase.cpp in Sources */,
</span><span class="cx"> A58E35911860DECF001F24FE /* InjectedScriptHost.cpp in Sources */,
</span><span class="cx"> A513E5CA185F9624007E95AD /* InjectedScriptManager.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGBasicBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGBasicBlock.h (173278 => 173279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGBasicBlock.h 2014-09-04 21:07:00 UTC (rev 173278)
+++ trunk/Source/JavaScriptCore/dfg/DFGBasicBlock.h 2014-09-04 21:08:38 UTC (rev 173279)
</span><span class="lines">@@ -186,6 +186,8 @@
</span><span class="cx"> Vector<Node*, 8> m_nodes;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+typedef Vector<BasicBlock*, 5> BlockList;
+
</ins><span class="cx"> struct UnlinkedBlock {
</span><span class="cx"> BasicBlock* m_block;
</span><span class="cx"> bool m_needsNormalLinking;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGBlockSetcpp"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/dfg/DFGBlockSet.cpp (0 => 173279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGBlockSet.cpp (rev 0)
+++ trunk/Source/JavaScriptCore/dfg/DFGBlockSet.cpp 2014-09-04 21:08:38 UTC (rev 173279)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "DFGBlockSet.h"
+
+#if ENABLE(DFG_JIT)
+
+namespace JSC { namespace DFG {
+
+void BlockSet::dump(PrintStream& out) const
+{
+ CommaPrinter comma(" ");
+ for (BlockIndex blockIndex = m_set.findBit(0, true); blockIndex < m_set.size(); blockIndex = m_set.findBit(blockIndex + 1, true))
+ out.print(comma, "#", blockIndex);
+}
+
+} } // namespace JSC::DFG
+
+#endif // ENABLE(DFG_JIT)
+
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGBlockSeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGBlockSet.h (173278 => 173279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGBlockSet.h 2014-09-04 21:07:00 UTC (rev 173278)
+++ trunk/Source/JavaScriptCore/dfg/DFGBlockSet.h 2014-09-04 21:08:38 UTC (rev 173279)
</span><span class="lines">@@ -32,6 +32,8 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC { namespace DFG {
</span><span class="cx">
</span><ins>+class Graph;
+
</ins><span class="cx"> class BlockSet {
</span><span class="cx"> public:
</span><span class="cx"> BlockSet() { }
</span><span class="lines">@@ -49,10 +51,98 @@
</span><span class="cx"> return m_set.get(block->index);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ class iterator {
+ public:
+ iterator()
+ : m_graph(nullptr)
+ , m_set(nullptr)
+ , m_index(0)
+ {
+ }
+
+ iterator& operator++()
+ {
+ m_index = m_set->m_set.findBit(m_index + 1, true);
+ return *this;
+ }
+
+ BasicBlock* operator*() const;
+
+ bool operator==(const iterator& other) const
+ {
+ return m_index == other.m_index;
+ }
+
+ bool operator!=(const iterator& other) const
+ {
+ return !(*this == other);
+ }
+
+ private:
+ friend class BlockSet;
+
+ Graph* m_graph;
+ const BlockSet* m_set;
+ size_t m_index;
+ };
+
+ class Iterable {
+ public:
+ Iterable(Graph& graph, const BlockSet& set)
+ : m_graph(graph)
+ , m_set(set)
+ {
+ }
+
+ iterator begin() const
+ {
+ iterator result;
+ result.m_graph = &m_graph;
+ result.m_set = &m_set;
+ result.m_index = m_set.m_set.findBit(0, true);
+ return result;
+ }
+
+ iterator end() const
+ {
+ iterator result;
+ result.m_graph = &m_graph;
+ result.m_set = &m_set;
+ result.m_index = m_set.m_set.size();
+ return result;
+ }
+
+ private:
+ Graph& m_graph;
+ const BlockSet& m_set;
+ };
+
+ Iterable iterable(Graph& graph) const
+ {
+ return Iterable(graph, *this);
+ }
+
+ void dump(PrintStream&) const;
+
</ins><span class="cx"> private:
</span><span class="cx"> BitVector m_set;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+class BlockAdder {
+public:
+ BlockAdder(BlockSet& set)
+ : m_set(set)
+ {
+ }
+
+ bool operator()(BasicBlock* block) const
+ {
+ return m_set.add(block);
+ }
+private:
+ BlockSet& m_set;
+};
+
</ins><span class="cx"> } } // namespace JSC::DFG
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(DFG_JIT)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGBlockSetInlinesh"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/dfg/DFGBlockSetInlines.h (0 => 173279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGBlockSetInlines.h (rev 0)
+++ trunk/Source/JavaScriptCore/dfg/DFGBlockSetInlines.h 2014-09-04 21:08:38 UTC (rev 173279)
</span><span class="lines">@@ -0,0 +1,46 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef DFGBlockSetInlines_h
+#define DFGBlockSetInlines_h
+
+#if ENABLE(DFG_JIT)
+
+#include "DFGBlockSet.h"
+#include "DFGGraph.h"
+
+namespace JSC { namespace DFG {
+
+inline BasicBlock* BlockSet::iterator::operator*() const
+{
+ return m_graph->block(m_index);
+}
+
+} } // namespace JSC::DFG
+
+#endif // ENABLE(DFG_JIT)
+
+#endif // DFGBlockSetInlines_h
+
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGDominatorscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGDominators.cpp (173278 => 173279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGDominators.cpp 2014-09-04 21:07:00 UTC (rev 173278)
+++ trunk/Source/JavaScriptCore/dfg/DFGDominators.cpp 2014-09-04 21:08:38 UTC (rev 173279)
</span><span class="lines">@@ -400,6 +400,48 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+BlockSet Dominators::strictDominatorsOf(BasicBlock* to) const
+{
+ BlockSet result;
+ forAllStrictDominatorsOf(to, BlockAdder(result));
+ return result;
+}
+
+BlockSet Dominators::dominatorsOf(BasicBlock* to) const
+{
+ BlockSet result;
+ forAllDominatorsOf(to, BlockAdder(result));
+ return result;
+}
+
+BlockSet Dominators::blocksStrictlyDominatedBy(BasicBlock* from) const
+{
+ BlockSet result;
+ forAllBlocksStrictlyDominatedBy(from, BlockAdder(result));
+ return result;
+}
+
+BlockSet Dominators::blocksDominatedBy(BasicBlock* from) const
+{
+ BlockSet result;
+ forAllBlocksDominatedBy(from, BlockAdder(result));
+ return result;
+}
+
+BlockSet Dominators::dominanceFrontierOf(BasicBlock* from) const
+{
+ BlockSet result;
+ forAllBlocksInDominanceFrontierOfImpl(from, BlockAdder(result));
+ return result;
+}
+
+BlockSet Dominators::iteratedDominanceFrontierOf(const BlockList& from) const
+{
+ BlockSet result;
+ forAllBlocksInIteratedDominanceFrontierOfImpl(from, BlockAdder(result));
+ return result;
+}
+
</ins><span class="cx"> bool Dominators::naiveDominates(BasicBlock* from, BasicBlock* to) const
</span><span class="cx"> {
</span><span class="cx"> for (BasicBlock* block = to; block; block = m_data[block].idomParent) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGDominatorsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGDominators.h (173278 => 173279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGDominators.h 2014-09-04 21:07:00 UTC (rev 173278)
+++ trunk/Source/JavaScriptCore/dfg/DFGDominators.h 2014-09-04 21:08:38 UTC (rev 173279)
</span><span class="lines">@@ -31,8 +31,8 @@
</span><span class="cx"> #include "DFGAnalysis.h"
</span><span class="cx"> #include "DFGBasicBlock.h"
</span><span class="cx"> #include "DFGBlockMap.h"
</span><ins>+#include "DFGBlockSet.h"
</ins><span class="cx"> #include "DFGCommon.h"
</span><del>-#include <wtf/FastBitVector.h>
</del><span class="cx">
</span><span class="cx"> namespace JSC { namespace DFG {
</span><span class="cx">
</span><span class="lines">@@ -57,11 +57,126 @@
</span><span class="cx"> return from == to || strictlyDominates(from, to);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ template<typename Functor>
+ void forAllStrictDominatorsOf(BasicBlock* to, const Functor& functor) const
+ {
+ for (BasicBlock* block = m_data[to].idomParent; block; block = m_data[block].idomParent)
+ functor(block);
+ }
+
+ template<typename Functor>
+ void forAllDominatorsOf(BasicBlock* to, const Functor& functor) const
+ {
+ for (BasicBlock* block = to; block; block = m_data[block].idomParent)
+ functor(block);
+ }
+
+ template<typename Functor>
+ void forAllBlocksStrictlyDominatedBy(BasicBlock* from, const Functor& functor) const
+ {
+ Vector<BasicBlock*, 16> worklist;
+ worklist.appendVector(m_data[from].idomKids);
+ while (!worklist.isEmpty()) {
+ BasicBlock* block = worklist.takeLast();
+ functor(block);
+ worklist.appendVector(m_data[block].idomKids);
+ }
+ }
+
+ template<typename Functor>
+ void forAllBlocksDominatedBy(BasicBlock* from, const Functor& functor) const
+ {
+ Vector<BasicBlock*, 16> worklist;
+ worklist.append(from);
+ while (!worklist.isEmpty()) {
+ BasicBlock* block = worklist.takeLast();
+ functor(block);
+ worklist.appendVector(m_data[block].idomKids);
+ }
+ }
+
+ BlockSet strictDominatorsOf(BasicBlock* to) const;
+ BlockSet dominatorsOf(BasicBlock* to) const;
+ BlockSet blocksStrictlyDominatedBy(BasicBlock* from) const;
+ BlockSet blocksDominatedBy(BasicBlock* from) const;
+
+ template<typename Functor>
+ void forAllBlocksInDominanceFrontierOf(
+ BasicBlock* from, const Functor& functor) const
+ {
+ BlockSet set;
+ forAllBlocksInDominanceFrontierOfImpl(
+ from,
+ [&] (BasicBlock* block) {
+ if (set.add(block))
+ functor(block);
+ });
+ }
+
+ BlockSet dominanceFrontierOf(BasicBlock* from) const;
+
+ template<typename Functor>
+ void forAllBlocksInIteratedDominanceFrontierOf(
+ const BlockList& from, const Functor& functor)
+ {
+ BlockSet set;
+ forAllBlocksInIteratedDominanceFrontierOfImpl(
+ from,
+ [&] (BasicBlock* block) -> bool {
+ if (!set.add(block))
+ return false;
+ functor(block);
+ return true;
+ });
+ }
+
+ BlockSet iteratedDominanceFrontierOf(const BlockList& from) const;
+
</ins><span class="cx"> void dump(PrintStream&) const;
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> bool naiveDominates(BasicBlock* from, BasicBlock* to) const;
</span><span class="cx">
</span><ins>+ template<typename Functor>
+ void forAllBlocksInDominanceFrontierOfImpl(
+ BasicBlock* from, const Functor& functor) const
+ {
+ // Paraphrasing from http://en.wikipedia.org/wiki/Dominator_(graph_theory):
+ // "The dominance frontier of a block 'from' is the set of all blocks 'to' such that
+ // 'from' dominates an immediate predecessor of 'to', but 'from' does not strictly
+ // dominate 'to'."
+ //
+ // A useful corner case to remember: a block may be in its own dominance frontier if it has
+ // a loop edge to itself, since it dominates itself and so it dominates its own immediate
+ // predecessor, and a block never strictly dominates itself.
+
+ forAllBlocksDominatedBy(
+ from,
+ [&] (BasicBlock* block) {
+ for (unsigned successorIndex = block->numSuccessors(); successorIndex--;) {
+ BasicBlock* to = block->successor(successorIndex);
+ if (!strictlyDominates(from, to))
+ functor(to);
+ }
+ });
+ }
+
+ template<typename Functor>
+ void forAllBlocksInIteratedDominanceFrontierOfImpl(
+ const BlockList& from, const Functor& functor) const
+ {
+ BlockList worklist = from;
+ while (!worklist.isEmpty()) {
+ BasicBlock* block = worklist.takeLast();
+ forAllBlocksInDominanceFrontierOfImpl(
+ block,
+ [&] (BasicBlock* otherBlock) {
+ if (functor(otherBlock))
+ worklist.append(otherBlock);
+ });
+ }
+ }
+
</ins><span class="cx"> struct BlockData {
</span><span class="cx"> BlockData()
</span><span class="cx"> : idomParent(nullptr)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGGraphcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGGraph.cpp (173278 => 173279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGGraph.cpp 2014-09-04 21:07:00 UTC (rev 173278)
+++ trunk/Source/JavaScriptCore/dfg/DFGGraph.cpp 2014-09-04 21:08:38 UTC (rev 173279)
</span><span class="lines">@@ -369,24 +369,10 @@
</span><span class="cx"> out.print(" ", *block->predecessors[i]);
</span><span class="cx"> out.print("\n");
</span><span class="cx"> if (m_dominators.isValid()) {
</span><del>- out.print(prefix, " Dominated by:");
- for (size_t i = 0; i < m_blocks.size(); ++i) {
- if (!this->block(i))
- continue;
- if (!m_dominators.dominates(this->block(i), block))
- continue;
- out.print(" #", i);
- }
- out.print("\n");
- out.print(prefix, " Dominates:");
- for (size_t i = 0; i < m_blocks.size(); ++i) {
- if (!this->block(i))
- continue;
- if (!m_dominators.dominates(block, this->block(i)))
- continue;
- out.print(" #", i);
- }
- out.print("\n");
</del><ins>+ out.print(prefix, " Dominated by: ", m_dominators.dominatorsOf(block), "\n");
+ out.print(prefix, " Dominates: ", m_dominators.blocksDominatedBy(block), "\n");
+ out.print(prefix, " Dominance Frontier: ", m_dominators.dominanceFrontierOf(block), "\n");
+ out.print(prefix, " Iterated Dominance Frontier: ", m_dominators.iteratedDominanceFrontierOf(BlockList(1, block)), "\n");
</ins><span class="cx"> }
</span><span class="cx"> if (m_naturalLoops.isValid()) {
</span><span class="cx"> if (const NaturalLoop* loop = m_naturalLoops.headerOf(block)) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGInvalidationPointInjectionPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGInvalidationPointInjectionPhase.cpp (173278 => 173279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGInvalidationPointInjectionPhase.cpp 2014-09-04 21:07:00 UTC (rev 173278)
+++ trunk/Source/JavaScriptCore/dfg/DFGInvalidationPointInjectionPhase.cpp 2014-09-04 21:08:38 UTC (rev 173279)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DFG_JIT)
</span><span class="cx">
</span><del>-#include "DFGBlockSet.h"
</del><ins>+#include "DFGBlockSetInlines.h"
</ins><span class="cx"> #include "DFGClobberize.h"
</span><span class="cx"> #include "DFGGraph.h"
</span><span class="cx"> #include "DFGInsertionSet.h"
</span><span class="lines">@@ -69,13 +69,8 @@
</span><span class="cx">
</span><span class="cx"> m_insertionSet.execute(block);
</span><span class="cx"> }
</span><del>-
- for (BlockIndex blockIndex = m_graph.numBlocks(); blockIndex--;) {
- BasicBlock* block = m_graph.block(blockIndex);
</del><span class="cx">
</span><del>- if (!blocksThatNeedInvalidationPoints.contains(block))
- continue;
-
</del><ins>+ for (BasicBlock* block : blocksThatNeedInvalidationPoints.iterable(m_graph)) {
</ins><span class="cx"> insertInvalidationCheck(0, block->at(0));
</span><span class="cx"> m_insertionSet.execute(block);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (173278 => 173279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-09-04 21:07:00 UTC (rev 173278)
+++ trunk/Source/WTF/ChangeLog 2014-09-04 21:08:38 UTC (rev 173279)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-09-03 Filip Pizlo <fpizlo@apple.com>
+
+ Beef up the DFG's CFG analyses to include iterated dominance frontiers and more user-friendly BlockSets
+ https://bugs.webkit.org/show_bug.cgi?id=136520
+
+ Reviewed by Geoffrey Garen.
+
+ Give BitVector a way to quickly find the next set (or unset) bit. Make BitVector equality
+ faster. Fix a minor closure goof in Spectrum.
+
+ * wtf/BitVector.cpp:
+ (WTF::BitVector::equalsSlowCase):
+ (WTF::BitVector::equalsSlowCaseFast):
+ (WTF::BitVector::equalsSlowCaseSimple):
+ * wtf/BitVector.h:
+ (WTF::BitVector::findBit):
+ (WTF::BitVector::findBitFast):
+ (WTF::BitVector::findBitSimple):
+ (WTF::BitVector::findBitInWord):
+ * wtf/Spectrum.h:
+ (WTF::Spectrum::removeIf):
+
</ins><span class="cx"> 2014-09-04 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Make hash table classes final
</span></span></pre></div>
<a id="trunkSourceWTFwtfBitVectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/BitVector.cpp (173278 => 173279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/BitVector.cpp 2014-09-04 21:07:00 UTC (rev 173278)
+++ trunk/Source/WTF/wtf/BitVector.cpp 2014-09-04 21:08:38 UTC (rev 173279)
</span><span class="lines">@@ -183,6 +183,50 @@
</span><span class="cx">
</span><span class="cx"> bool BitVector::equalsSlowCase(const BitVector& other) const
</span><span class="cx"> {
</span><ins>+ bool result = equalsSlowCaseFast(other);
+ ASSERT(result == equalsSlowCaseSimple(other));
+ return result;
+}
+
+bool BitVector::equalsSlowCaseFast(const BitVector& other) const
+{
+ if (isInline() != other.isInline())
+ return equalsSlowCaseSimple(other);
+
+ const OutOfLineBits* myBits = outOfLineBits();
+ const OutOfLineBits* otherBits = other.outOfLineBits();
+
+ size_t myNumWords = myBits->numWords();
+ size_t otherNumWords = otherBits->numWords();
+ size_t minNumWords;
+ size_t maxNumWords;
+
+ const OutOfLineBits* longerBits;
+ if (myNumWords < otherNumWords) {
+ minNumWords = myNumWords;
+ maxNumWords = otherNumWords;
+ longerBits = otherBits;
+ } else {
+ minNumWords = otherNumWords;
+ maxNumWords = myNumWords;
+ longerBits = myBits;
+ }
+
+ for (size_t i = minNumWords; i < maxNumWords; ++i) {
+ if (longerBits->bits()[i])
+ return false;
+ }
+
+ for (size_t i = minNumWords; i--;) {
+ if (myBits->bits()[i] != otherBits->bits()[i])
+ return false;
+ }
+
+ return false;
+}
+
+bool BitVector::equalsSlowCaseSimple(const BitVector& other) const
+{
</ins><span class="cx"> // This is really cheesy, but probably good enough for now.
</span><span class="cx"> for (unsigned i = std::max(size(), other.size()); i--;) {
</span><span class="cx"> if (get(i) != other.get(i))
</span></span></pre></div>
<a id="trunkSourceWTFwtfBitVectorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/BitVector.h (173278 => 173279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/BitVector.h 2014-09-04 21:07:00 UTC (rev 173278)
+++ trunk/Source/WTF/wtf/BitVector.h 2014-09-04 21:08:38 UTC (rev 173279)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2011 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2011, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include <stdio.h>
</span><span class="cx"> #include <wtf/Assertions.h>
</span><ins>+#include <wtf/DataLog.h>
</ins><span class="cx"> #include <wtf/HashFunctions.h>
</span><span class="cx"> #include <wtf/HashTraits.h>
</span><span class="cx"> #include <wtf/PrintStream.h>
</span><span class="lines">@@ -215,6 +216,19 @@
</span><span class="cx"> return bitCountSlow();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ size_t findBit(size_t index, bool value) const
+ {
+ size_t result = findBitFast(index, value);
+ if (!ASSERT_DISABLED) {
+ size_t expectedResult = findBitSimple(index, value);
+ if (result != expectedResult) {
+ dataLog("findBit(", index, ", ", value, ") on ", *this, " should have gotten ", expectedResult, " but got ", result, "\n");
+ ASSERT_NOT_REACHED();
+ }
+ }
+ return result;
+ }
+
</ins><span class="cx"> WTF_EXPORT_PRIVATE void dump(PrintStream& out) const;
</span><span class="cx">
</span><span class="cx"> enum EmptyValueTag { EmptyValue };
</span><span class="lines">@@ -289,6 +303,64 @@
</span><span class="cx"> return WTF::bitCount(static_cast<uint64_t>(bits));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ size_t findBitFast(size_t startIndex, bool value) const
+ {
+ if (isInline()) {
+ size_t index = startIndex;
+ findBitInWord(m_bitsOrPointer, index, maxInlineBits(), value);
+ return index;
+ }
+
+ const OutOfLineBits* bits = outOfLineBits();
+
+ // value = true: casts to 1, then xors to 0, then negates to 0.
+ // value = false: casts to 0, then xors to 1, then negates to -1 (i.e. all one bits).
+ uintptr_t skipValue = -(static_cast<uintptr_t>(value) ^ 1);
+ size_t numWords = bits->numWords();
+
+ size_t wordIndex = startIndex / bitsInPointer();
+ size_t startIndexInWord = startIndex - wordIndex * bitsInPointer();
+
+ while (wordIndex < numWords) {
+ uintptr_t word = bits->bits()[wordIndex];
+ if (word != skipValue) {
+ size_t index = startIndexInWord;
+ if (findBitInWord(word, index, bitsInPointer(), value))
+ return wordIndex * bitsInPointer() + index;
+ }
+
+ wordIndex++;
+ startIndexInWord = 0;
+ }
+
+ return bits->numBits();
+ }
+
+ size_t findBitSimple(size_t index, bool value) const
+ {
+ while (index < size()) {
+ if (get(index) == value)
+ return index;
+ index++;
+ }
+ return size();
+ }
+
+ static bool findBitInWord(uintptr_t word, size_t& index, size_t endIndex, bool value)
+ {
+ word >>= index;
+
+ while (index < endIndex) {
+ if ((word & 1) == static_cast<uintptr_t>(value))
+ return true;
+ index++;
+ word >>= 1;
+ }
+
+ index = endIndex;
+ return false;
+ }
+
</ins><span class="cx"> class OutOfLineBits {
</span><span class="cx"> public:
</span><span class="cx"> size_t numBits() const { return m_numBits; }
</span><span class="lines">@@ -324,6 +396,8 @@
</span><span class="cx"> WTF_EXPORT_PRIVATE size_t bitCountSlow() const;
</span><span class="cx">
</span><span class="cx"> WTF_EXPORT_PRIVATE bool equalsSlowCase(const BitVector& other) const;
</span><ins>+ bool equalsSlowCaseFast(const BitVector& other) const;
+ bool equalsSlowCaseSimple(const BitVector& other) const;
</ins><span class="cx"> WTF_EXPORT_PRIVATE uintptr_t hashSlowCase() const;
</span><span class="cx">
</span><span class="cx"> uintptr_t* bits()
</span></span></pre></div>
<a id="trunkSourceWTFwtfSpectrumh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Spectrum.h (173278 => 173279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Spectrum.h 2014-09-04 21:07:00 UTC (rev 173278)
+++ trunk/Source/WTF/wtf/Spectrum.h 2014-09-04 21:08:38 UTC (rev 173279)
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> template<typename Functor>
</span><span class="cx"> void removeIf(const Functor& functor)
</span><span class="cx"> {
</span><del>- m_map.removeIf([functor] (typename HashMap<T, CounterType>::KeyValuePairType& pair) {
</del><ins>+ m_map.removeIf([&functor] (typename HashMap<T, CounterType>::KeyValuePairType& pair) {
</ins><span class="cx"> return functor(KeyAndCount(pair.key, pair.value));
</span><span class="cx"> });
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>