Changeset 153278 in webkit for trunk/Source/JavaScriptCore/dfg/DFGCSEPhase.cpp

Timestamp:

Jul 24, 2013, 9:04:53 PM (12 years ago)

Author:

[email protected]

Message:

fourthTier: Rationalize Node::replacement
​https://bugs.webkit.org/show_bug.cgi?id=118774

Reviewed by Oliver Hunt.

• Clearing of replacements is now done in Graph::clearReplacements().

• New nodes now have replacement set to 0.

• Node::replacement is now part of a 'misc' union. I'll be putting at least one other field into that union as part of LICM work (see ​https://bugs.webkit.org/show_bug.cgi?id=118749).

• dfg/DFGCPSRethreadingPhase.cpp:

(JSC::DFG::CPSRethreadingPhase::run):
(JSC::DFG::CPSRethreadingPhase::freeUnnecessaryNodes):
(JSC::DFG::CPSRethreadingPhase::canonicalizeGetLocalFor):

• dfg/DFGCSEPhase.cpp:

(JSC::DFG::CSEPhase::run):
(JSC::DFG::CSEPhase::setReplacement):
(JSC::DFG::CSEPhase::performBlockCSE):

• dfg/DFGGraph.cpp:

(DFG):
(JSC::DFG::Graph::clearReplacements):

• dfg/DFGGraph.h:

(JSC::DFG::Graph::performSubstitutionForEdge):
(Graph):

• dfg/DFGNode.h:

(JSC::DFG::Node::Node):

• dfg/DFGSSAConversionPhase.cpp:

(JSC::DFG::SSAConversionPhase::run):

File:

• trunk/Source/JavaScriptCore/dfg/DFGCSEPhase.cpp (modified) (5 diffs)

trunk/Source/JavaScriptCore/dfg/DFGCSEPhase.cpp

@@ -53 +53 @@
         m_changed = false;
         
+        m_graph.clearReplacements();
+        
         for (unsigned blockIndex = 0; blockIndex < m_graph.numBlocks(); ++blockIndex)
             performBlockCSE(m_graph.block(blockIndex));
@@ -1006 +1008 @@
         
         // At this point we will eliminate all references to this node.
-        m_currentNode->replacement = replacement;
+        m_currentNode->misc.replacement = replacement;
         
         m_changed = true;
@@ -1397 +1399 @@
             m_lastSeen[i] = UINT_MAX;
         
-        // All Phis need to already be marked as relevant to OSR, and have their
-        // replacements cleared, so we don't get confused while doing substitutions on
-        // GetLocal's.
-        for (unsigned i = 0; i < block->phis.size(); ++i) {
-            ASSERT(block->phis[i]->flags() & NodeRelevantToOSR);
-            block->phis[i]->replacement = 0;
+        // All Phis need to already be marked as relevant to OSR.
+        if (!ASSERT_DISABLED) {
+            for (unsigned i = 0; i < block->phis.size(); ++i)
+                ASSERT(block->phis[i]->flags() & NodeRelevantToOSR);
         }
         
@@ -1410 +1410 @@
             Node* node = block->at(i);
             
-            node->replacement = 0;
-            
             switch (node->op()) {
             case SetLocal:
@@ -1431 +1429 @@
             // Nobody should have replacements set.
             for (unsigned i = 0; i < block->size(); ++i)
-                ASSERT(!block->at(i)->replacement);
+                ASSERT(!block->at(i)->misc.replacement);
         }
     }