Changeset 147053 in webkit

Timestamp:

Mar 27, 2013 8:41:11 PM (11 years ago)

Author:

ggaren@apple.com

Message:

Removed some dead code in the DFG bytecode parser
​https://bugs.webkit.org/show_bug.cgi?id=113472

Reviewed by Sam Weinig.

Now that Phi creation and liveness analysis are separate passes, we can
remove the vestiges of code that used to do that in the bytecode
parser.

• dfg/DFGByteCodeParser.cpp:

(ByteCodeParser):
(JSC::DFG::ByteCodeParser::addToGraph):
(JSC::DFG::ByteCodeParser::parse):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• dfg/DFGByteCodeParser.cpp (modified) (6 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2013-03-27  Geoffrey Garen  <ggaren@apple.com>
+
+        Removed some dead code in the DFG bytecode parser
+        https://bugs.webkit.org/show_bug.cgi?id=113472
+
+        Reviewed by Sam Weinig.
+
+        Now that Phi creation and liveness analysis are separate passes, we can
+        remove the vestiges of code that used to do that in the bytecode
+        parser.
+
+        * dfg/DFGByteCodeParser.cpp:
+        (ByteCodeParser):
+        (JSC::DFG::ByteCodeParser::addToGraph):
+        (JSC::DFG::ByteCodeParser::parse):
+
 2013-03-27  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp

@@ -194 +194 @@
     void linkBlock(BasicBlock*, Vector<BlockIndex>& possibleTargets);
     void linkBlocks(Vector<UnlinkedBlock>& unlinkedBlocks, Vector<BlockIndex>& possibleTargets);
-    // Link GetLocal & SetLocal nodes, to ensure live values are generated.
-    enum PhiStackType {
-        LocalPhiStack,
-        ArgumentPhiStack
-    };
-    template<PhiStackType stackType>
-    void processPhiStack();
     
     VariableAccessData* newVariableAccessData(int operand, bool isCaptured)
@@ -698 +691 @@
     }
     
-    // These methods create a node and add it to the graph. If nodes of this type are
-    // 'mustGenerate' then the node  will implicitly be ref'ed to ensure generation.
     Node* addToGraph(NodeType op, Node* child1 = 0, Node* child2 = 0, Node* child3 = 0)
     {
@@ -720 +711 @@
         Node* result = m_graph.addNode(
             SpecNone, op, currentCodeOrigin(), info, Edge(child1), Edge(child2), Edge(child3));
-        if (op == Phi)
-            m_currentBlock->phis.append(result);
-        else
-            m_currentBlock->append(result);
+        ASSERT(op != Phi);
+        m_currentBlock->append(result);
         return result;
     }
@@ -746 +735 @@
         m_numPassedVarArgs = 0;
         
-        return result;
-    }
-
-    Node* insertPhiNode(OpInfo info, BasicBlock* block)
-    {
-        Node* result = m_graph.addNode(SpecNone, Phi, currentCodeOrigin(), info);
-        block->phis.append(result);
         return result;
     }
@@ -1025 +1007 @@
     unsigned m_globalResolveNumber;
 
-    struct PhiStackEntry {
-        PhiStackEntry(BasicBlock* block, Node* phi, unsigned varNo)
-            : m_block(block)
-            , m_phi(phi)
-            , m_varNo(varNo)
-        {
-        }
-
-        BasicBlock* m_block;
-        Node* m_phi;
-        unsigned m_varNo;
-    };
-    Vector<PhiStackEntry, 16> m_argumentPhiStack;
-    Vector<PhiStackEntry, 16> m_localPhiStack;
-    
     HashMap<ConstantBufferKey, unsigned> m_constantBufferCache;
     
@@ -3761 +3728 @@
     linkBlocks(inlineStackEntry.m_unlinkedBlocks, inlineStackEntry.m_blockLinkingTargets);
     m_graph.determineReachability();
-#if DFG_ENABLE(DEBUG_PROPAGATION_VERBOSE)
-    dataLogF("Processing local variable phis.\n");
-#endif
     
     ASSERT(m_preservedVars.size());