Changeset 189138 in webkit for trunk/Source/JavaScriptCore/dfg/DFGInPlaceAbstractState.h

Timestamp:

Aug 28, 2015, 7:04:36 PM (10 years ago)

Author:

[email protected]

Message:

[JSC] Get rid of DFG's MergeMode
​https://bugs.webkit.org/show_bug.cgi?id=148245

Patch by Benjamin Poulain <​[email protected]> 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.

File:

• trunk/Source/JavaScriptCore/dfg/DFGInPlaceAbstractState.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/dfg/DFGInPlaceAbstractState.h

@@ -32 +32 @@
 #include "DFGBranchDirection.h"
 #include "DFGGraph.h"
-#include "DFGMergeMode.h"
 #include "DFGNode.h"
 
@@ -77 +76 @@
     // MergeToSuccessors is passed, then this merges everything we have
     // learned about how the state changes during this block's execution into
-    // the block's data structures. There are three return modes, depending
-    // on the value of mergeMode:
+    // the block's data structures.
     //
-    // 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);
+    // 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();
     
     // Reset the AbstractState. This throws away any results, and at this point