<!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>[189138] 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/189138">189138</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2015-08-28 19:04:36 -0700 (Fri, 28 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[JSC] Get rid of DFG's MergeMode
https://bugs.webkit.org/show_bug.cgi?id=148245
Patch by Benjamin Poulain <bpoulain@apple.com> on 2015-08-28
Reviewed by Mark Lam.
That code has become useless, the merge mode is always MergeToSuccessors.
* JavaScriptCore.xcodeproj/project.pbxproj:
* dfg/DFGCFAPhase.cpp:
(JSC::DFG::CFAPhase::performBlockCFA):
* dfg/DFGInPlaceAbstractState.cpp:
(JSC::DFG::InPlaceAbstractState::endBasicBlock):
* dfg/DFGInPlaceAbstractState.h:
* dfg/DFGMergeMode.h: Removed.</pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxprojfilters">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj">trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGCFAPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGCFAPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGInPlaceAbstractStatecpp">trunk/Source/JavaScriptCore/dfg/DFGInPlaceAbstractState.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGInPlaceAbstractStateh">trunk/Source/JavaScriptCore/dfg/DFGInPlaceAbstractState.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoredfgDFGMergeModeh">trunk/Source/JavaScriptCore/dfg/DFGMergeMode.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (189137 => 189138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-08-29 01:58:05 UTC (rev 189137)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-08-29 02:04:36 UTC (rev 189138)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2015-08-28 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><ins>+ [JSC] Get rid of DFG's MergeMode
+ https://bugs.webkit.org/show_bug.cgi?id=148245
+
+ Reviewed by Mark Lam.
+
+ That code has become useless, the merge mode is always MergeToSuccessors.
+
+ * JavaScriptCore.xcodeproj/project.pbxproj:
+ * dfg/DFGCFAPhase.cpp:
+ (JSC::DFG::CFAPhase::performBlockCFA):
+ * dfg/DFGInPlaceAbstractState.cpp:
+ (JSC::DFG::InPlaceAbstractState::endBasicBlock):
+ * dfg/DFGInPlaceAbstractState.h:
+ * dfg/DFGMergeMode.h: Removed.
+
+2015-08-28 Benjamin Poulain <bpoulain@apple.com>
+
</ins><span class="cx"> [JSC][x86] Improve the compare functions when comparing with zero
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=148536
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj (189137 => 189138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2015-08-29 01:58:05 UTC (rev 189137)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2015-08-29 02:04:36 UTC (rev 189138)
</span><span class="lines">@@ -1170,7 +1170,6 @@
</span><span class="cx"> <ClInclude Include="..\dfg\DFGLongLivedState.h" />
</span><span class="cx"> <ClInclude Include="..\dfg\DFGLoopPreHeaderCreationPhase.h" />
</span><span class="cx"> <ClInclude Include="..\dfg\DFGMayExit.h" />
</span><del>- <ClInclude Include="..\dfg\DFGMergeMode.h" />
</del><span class="cx"> <ClInclude Include="..\dfg\DFGMinifiedGraph.h" />
</span><span class="cx"> <ClInclude Include="..\dfg\DFGMinifiedID.h" />
</span><span class="cx"> <ClInclude Include="..\dfg\DFGMinifiedNode.h" />
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters (189137 => 189138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters 2015-08-29 01:58:05 UTC (rev 189137)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters 2015-08-29 02:04:36 UTC (rev 189138)
</span><span class="lines">@@ -3736,9 +3736,6 @@
</span><span class="cx"> <ClInclude Include="..\dfg\DFGLoopPreHeaderCreationPhase.h">
</span><span class="cx"> <Filter>dfg</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\dfg\DFGMergeMode.h">
- <Filter>dfg</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\dfg\DFGMinifiedGraph.h">
</span><span class="cx"> <Filter>dfg</Filter>
</span><span class="cx"> </ClInclude>
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (189137 => 189138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2015-08-29 01:58:05 UTC (rev 189137)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2015-08-29 02:04:36 UTC (rev 189138)
</span><span class="lines">@@ -1377,7 +1377,6 @@
</span><span class="cx"> A704D90417A0BAA8006BA554 /* DFGAbstractInterpreterInlines.h in Headers */ = {isa = PBXBuildFile; fileRef = A704D8FF17A0BAA8006BA554 /* DFGAbstractInterpreterInlines.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> A704D90517A0BAA8006BA554 /* DFGInPlaceAbstractState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A704D90017A0BAA8006BA554 /* DFGInPlaceAbstractState.cpp */; };
</span><span class="cx"> A704D90617A0BAA8006BA554 /* DFGInPlaceAbstractState.h in Headers */ = {isa = PBXBuildFile; fileRef = A704D90117A0BAA8006BA554 /* DFGInPlaceAbstractState.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- A704D90717A0BAA8006BA554 /* DFGMergeMode.h in Headers */ = {isa = PBXBuildFile; fileRef = A704D90217A0BAA8006BA554 /* DFGMergeMode.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> A709F2F017A0AC0400512E98 /* SlowPathCall.h in Headers */ = {isa = PBXBuildFile; fileRef = A709F2EF17A0AC0400512E98 /* SlowPathCall.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> A709F2F217A0AC2A00512E98 /* CommonSlowPaths.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A709F2F117A0AC2A00512E98 /* CommonSlowPaths.cpp */; };
</span><span class="cx"> A71236E51195F33C00BD2174 /* JITOpcodes32_64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A71236E41195F33C00BD2174 /* JITOpcodes32_64.cpp */; };
</span><span class="lines">@@ -3233,7 +3232,6 @@
</span><span class="cx"> A704D8FF17A0BAA8006BA554 /* DFGAbstractInterpreterInlines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DFGAbstractInterpreterInlines.h; path = dfg/DFGAbstractInterpreterInlines.h; sourceTree = "<group>"; };
</span><span class="cx"> A704D90017A0BAA8006BA554 /* DFGInPlaceAbstractState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DFGInPlaceAbstractState.cpp; path = dfg/DFGInPlaceAbstractState.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A704D90117A0BAA8006BA554 /* DFGInPlaceAbstractState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DFGInPlaceAbstractState.h; path = dfg/DFGInPlaceAbstractState.h; sourceTree = "<group>"; };
</span><del>- A704D90217A0BAA8006BA554 /* DFGMergeMode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DFGMergeMode.h; path = dfg/DFGMergeMode.h; sourceTree = "<group>"; };
</del><span class="cx"> A709F2EF17A0AC0400512E98 /* SlowPathCall.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SlowPathCall.h; sourceTree = "<group>"; };
</span><span class="cx"> A709F2F117A0AC2A00512E98 /* CommonSlowPaths.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CommonSlowPaths.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A71236E41195F33C00BD2174 /* JITOpcodes32_64.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JITOpcodes32_64.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -5247,7 +5245,6 @@
</span><span class="cx"> A767B5B417A0B9650063D940 /* DFGLoopPreHeaderCreationPhase.h */,
</span><span class="cx"> 0F5874EB194FEB1200AAB2C1 /* DFGMayExit.cpp */,
</span><span class="cx"> 0F5874EC194FEB1200AAB2C1 /* DFGMayExit.h */,
</span><del>- A704D90217A0BAA8006BA554 /* DFGMergeMode.h */,
</del><span class="cx"> 0F1725FE1B48719A00AC3A55 /* DFGMinifiedGraph.cpp */,
</span><span class="cx"> 0F2BDC3D1522801700CD8910 /* DFGMinifiedGraph.h */,
</span><span class="cx"> 0FB4B51016B3A964003F696B /* DFGMinifiedID.h */,
</span><span class="lines">@@ -6143,7 +6140,6 @@
</span><span class="cx"> 709FB8681AE335C60039D069 /* JSWeakSet.h in Headers */,
</span><span class="cx"> A767B5B617A0B9650063D940 /* DFGLoopPreHeaderCreationPhase.h in Headers */,
</span><span class="cx"> 0F2B9CED19D0BA7D00B1D1B5 /* DFGPromotedHeapLocation.h in Headers */,
</span><del>- A704D90717A0BAA8006BA554 /* DFGMergeMode.h in Headers */,
</del><span class="cx"> 0FB17663196B8F9E0091052A /* DFGPureValue.h in Headers */,
</span><span class="cx"> FE68C6371B90DE040042BCB3 /* MacroAssemblerPrinter.h in Headers */,
</span><span class="cx"> 0F2BDC451522801B00CD8910 /* DFGMinifiedGraph.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGCFAPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGCFAPhase.cpp (189137 => 189138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGCFAPhase.cpp 2015-08-29 01:58:05 UTC (rev 189137)
+++ trunk/Source/JavaScriptCore/dfg/DFGCFAPhase.cpp 2015-08-29 02:04:36 UTC (rev 189138)
</span><span class="lines">@@ -173,7 +173,7 @@
</span><span class="cx"> m_interpreter.dump(WTF::dataFile());
</span><span class="cx"> dataLogF("\n");
</span><span class="cx"> }
</span><del>- m_changed |= m_state.endBasicBlock(MergeToSuccessors);
</del><ins>+ m_changed |= m_state.endBasicBlock();
</ins><span class="cx">
</span><span class="cx"> if (m_verbose) {
</span><span class="cx"> dataLog(" tail vars: ", block->valuesAtTail, "\n");
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGInPlaceAbstractStatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGInPlaceAbstractState.cpp (189137 => 189138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGInPlaceAbstractState.cpp 2015-08-29 01:58:05 UTC (rev 189137)
+++ trunk/Source/JavaScriptCore/dfg/DFGInPlaceAbstractState.cpp 2015-08-29 02:04:36 UTC (rev 189138)
</span><span class="lines">@@ -162,7 +162,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool InPlaceAbstractState::endBasicBlock(MergeMode mergeMode)
</del><ins>+bool InPlaceAbstractState::endBasicBlock()
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_block);
</span><span class="cx">
</span><span class="lines">@@ -177,50 +177,41 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool changed = false;
</del><ins>+ bool changed = checkAndSet(block->cfaStructureClobberStateAtTail, m_structureClobberState);
</ins><span class="cx">
</span><del>- if ((mergeMode != DontMerge) || !ASSERT_DISABLED) {
- changed |= checkAndSet(block->cfaStructureClobberStateAtTail, m_structureClobberState);
-
- switch (m_graph.m_form) {
- case ThreadedCPS: {
- for (size_t argument = 0; argument < block->variablesAtTail.numberOfArguments(); ++argument) {
- AbstractValue& destination = block->valuesAtTail.argument(argument);
- changed |= mergeStateAtTail(destination, m_variables.argument(argument), block->variablesAtTail.argument(argument));
- }
-
- for (size_t local = 0; local < block->variablesAtTail.numberOfLocals(); ++local) {
- AbstractValue& destination = block->valuesAtTail.local(local);
- changed |= mergeStateAtTail(destination, m_variables.local(local), block->variablesAtTail.local(local));
- }
- break;
</del><ins>+ switch (m_graph.m_form) {
+ case ThreadedCPS: {
+ for (size_t argument = 0; argument < block->variablesAtTail.numberOfArguments(); ++argument) {
+ AbstractValue& destination = block->valuesAtTail.argument(argument);
+ changed |= mergeStateAtTail(destination, m_variables.argument(argument), block->variablesAtTail.argument(argument));
</ins><span class="cx"> }
</span><del>-
- case SSA: {
- for (size_t i = 0; i < block->valuesAtTail.size(); ++i)
- changed |= block->valuesAtTail[i].merge(m_variables[i]);
-
- HashSet<Node*>::iterator iter = block->ssa->liveAtTail.begin();
- HashSet<Node*>::iterator end = block->ssa->liveAtTail.end();
- for (; iter != end; ++iter) {
- Node* node = *iter;
- changed |= block->ssa->valuesAtTail.find(node)->value.merge(forNode(node));
- }
- break;
</del><ins>+
+ for (size_t local = 0; local < block->variablesAtTail.numberOfLocals(); ++local) {
+ AbstractValue& destination = block->valuesAtTail.local(local);
+ changed |= mergeStateAtTail(destination, m_variables.local(local), block->variablesAtTail.local(local));
</ins><span class="cx"> }
</span><del>-
- default:
- RELEASE_ASSERT_NOT_REACHED();
</del><ins>+ break;
+ }
+
+ case SSA: {
+ for (size_t i = 0; i < block->valuesAtTail.size(); ++i)
+ changed |= block->valuesAtTail[i].merge(m_variables[i]);
+
+ HashSet<Node*>::iterator iter = block->ssa->liveAtTail.begin();
+ HashSet<Node*>::iterator end = block->ssa->liveAtTail.end();
+ for (; iter != end; ++iter) {
+ Node* node = *iter;
+ changed |= block->ssa->valuesAtTail.find(node)->value.merge(forNode(node));
</ins><span class="cx"> }
</span><ins>+ break;
</ins><span class="cx"> }
</span><del>-
- ASSERT(mergeMode != DontMerge || !changed);
-
</del><ins>+
+ default:
+ RELEASE_ASSERT_NOT_REACHED();
+ }
+
</ins><span class="cx"> reset();
</span><span class="cx">
</span><del>- if (mergeMode != MergeToSuccessors)
- return changed;
-
</del><span class="cx"> return mergeToSuccessors(block);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGInPlaceAbstractStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGInPlaceAbstractState.h (189137 => 189138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGInPlaceAbstractState.h 2015-08-29 01:58:05 UTC (rev 189137)
+++ trunk/Source/JavaScriptCore/dfg/DFGInPlaceAbstractState.h 2015-08-29 02:04:36 UTC (rev 189138)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> #include "DFGAbstractValue.h"
</span><span class="cx"> #include "DFGBranchDirection.h"
</span><span class="cx"> #include "DFGGraph.h"
</span><del>-#include "DFGMergeMode.h"
</del><span class="cx"> #include "DFGNode.h"
</span><span class="cx">
</span><span class="cx"> namespace JSC { namespace DFG {
</span><span class="lines">@@ -76,26 +75,14 @@
</span><span class="cx"> // Finish abstractly executing a basic block. If MergeToTail or
</span><span class="cx"> // MergeToSuccessors is passed, then this merges everything we have
</span><span class="cx"> // learned about how the state changes during this block's execution into
</span><del>- // the block's data structures. There are three return modes, depending
- // on the value of mergeMode:
</del><ins>+ // the block's data structures.
</ins><span class="cx"> //
</span><del>- // DontMerge:
- // Always returns false.
- //
- // MergeToTail:
- // Returns true if the state of the block at the tail was changed.
- // This means that you must call mergeToSuccessors(), and if that
- // returns true, then you must revisit (at least) the successor
- // blocks. False will always be returned if the block is terminal
- // (i.e. ends in Throw or Return, or has a ForceOSRExit inside it).
- //
- // MergeToSuccessors:
- // Returns true if the state of the block at the tail was changed,
- // and, if the state at the heads of successors was changed.
- // A true return means that you must revisit (at least) the successor
- // blocks. This also sets cfaShouldRevisit to true for basic blocks
- // that must be visited next.
- bool endBasicBlock(MergeMode);
</del><ins>+ // Returns true if the state of the block at the tail was changed,
+ // and, if the state at the heads of successors was changed.
+ // A true return means that you must revisit (at least) the successor
+ // blocks. This also sets cfaShouldRevisit to true for basic blocks
+ // that must be visited next.
+ bool endBasicBlock();
</ins><span class="cx">
</span><span class="cx"> // Reset the AbstractState. This throws away any results, and at this point
</span><span class="cx"> // you can safely call beginBasicBlock() on any basic block.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGMergeModeh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/dfg/DFGMergeMode.h (189137 => 189138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGMergeMode.h 2015-08-29 01:58:05 UTC (rev 189137)
+++ trunk/Source/JavaScriptCore/dfg/DFGMergeMode.h 2015-08-29 02:04:36 UTC (rev 189138)
</span><span class="lines">@@ -1,47 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013 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 DFGMergeMode_h
-#define DFGMergeMode_h
-
-namespace JSC { namespace DFG {
-
-enum MergeMode {
- // Don't merge the state in AbstractState with basic blocks.
- DontMerge,
-
- // Merge the state in AbstractState with the tail of the basic
- // block being analyzed.
- MergeToTail,
-
- // Merge the state in AbstractState with the tail of the basic
- // block, and with the heads of successor blocks.
- MergeToSuccessors
-};
-
-} } // namespace JSC::DFG
-
-#endif // DFGMergeMode_h
-
</del></span></pre>
</div>
</div>
</body>
</html>