Changeset 208367 in webkit for trunk/Source/JavaScriptCore/dfg/DFGInPlaceAbstractState.cpp

Timestamp:

Nov 3, 2016, 9:38:58 PM (9 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r208364.
​https://bugs.webkit.org/show_bug.cgi?id=164402

broke the build (Requested by smfr on #webkit).

Reverted changeset:

"DFG plays fast and loose with the shadow values of a Phi"
​https://bugs.webkit.org/show_bug.cgi?id=164309
​http://trac.webkit.org/changeset/208364

File:

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

trunk/Source/JavaScriptCore/dfg/DFGInPlaceAbstractState.cpp

@@ -42 +42 @@
 InPlaceAbstractState::InPlaceAbstractState(Graph& graph)
     : m_graph(graph)
-    , m_abstractValues(*graph.m_abstractValuesCache)
+    , m_abstractValues(graph.abstractValuesCache())
     , m_variables(m_graph.m_codeBlock->numParameters(), graph.m_localVars)
     , m_block(0)
@@ -58 +58 @@
     ASSERT(basicBlock->variablesAtHead.numberOfLocals() == basicBlock->variablesAtTail.numberOfLocals());
 
-    m_abstractValues.resize();
-    
-    for (size_t i = 0; i < basicBlock->size(); i++) {
-        NodeFlowProjection::forEach(
-            basicBlock->at(i), [&] (NodeFlowProjection nodeProjection) {
-                forNode(nodeProjection).clear();
-            });
-    }
+    // Certain phases insert nodes in a block after running through it.
+    // We cannot reserve the space for AbstractValues when initializing AbstractState because the number of values
+    // can increase as we execute. Instead, we increase the size as needed before processing each block.
+    m_abstractValues.resize(m_graph.maxNodeCount());
+    
+    for (size_t i = 0; i < basicBlock->size(); i++)
+        forNode(basicBlock->at(i)).clear();
 
     m_variables = basicBlock->valuesAtHead;
     
     if (m_graph.m_form == SSA) {
-        for (NodeAbstractValuePair& entry : basicBlock->ssa->valuesAtHead) {
-            if (entry.node.isStillValid())
-                forNode(entry.node) = entry.value;
-        }
+        for (auto& entry : basicBlock->ssa->valuesAtHead)
+            forNode(entry.node) = entry.value;
     }
     basicBlock->cfaShouldRevisit = false;
@@ -84 +81 @@
 }
 
-static void setLiveValues(Vector<NodeAbstractValuePair>& values, const Vector<NodeFlowProjection>& live)
+static void setLiveValues(Vector<BasicBlock::SSAData::NodeAbstractValuePair>& values, const Vector<Node*>& live)
 {
     values.resize(0);
     values.reserveCapacity(live.size());
-    for (NodeFlowProjection node : live)
-        values.uncheckedAppend(NodeAbstractValuePair { node, AbstractValue() });
+    for (Node* node : live)
+        values.uncheckedAppend(BasicBlock::SSAData::NodeAbstractValuePair { node, AbstractValue() });
 }
 
@@ -203 +200 @@
             block->valuesAtTail[i].merge(m_variables[i]);
 
-        for (NodeAbstractValuePair& valueAtTail : block->ssa->valuesAtTail) {
+        for (auto& valueAtTail : block->ssa->valuesAtTail) {
             AbstractValue& valueAtNode = forNode(valueAtTail.node);
             valueAtTail.value.merge(valueAtNode);
@@ -295 +292 @@
             changed |= to->valuesAtHead[i].merge(from->valuesAtTail[i]);
 
-        for (NodeAbstractValuePair& entry : to->ssa->valuesAtHead) {
-            NodeFlowProjection node = entry.node;
+        for (auto& entry : to->ssa->valuesAtHead) {
+            Node* node = entry.node;
             if (verbose)
                 dataLog("      Merging for ", node, ": from ", forNode(node), " to ", entry.value, "\n");
 #ifndef NDEBUG
             unsigned valueCountInFromBlock = 0;
-            for (NodeAbstractValuePair& fromBlockValueAtTail : from->ssa->valuesAtTail) {
+            for (auto& fromBlockValueAtTail : from->ssa->valuesAtTail) {
                 if (fromBlockValueAtTail.node == node) {
                     ASSERT(fromBlockValueAtTail.value == forNode(node));