Changeset 103255 in webkit for trunk/Source/JavaScriptCore/dfg/DFGAbstractState.cpp

Timestamp:

Dec 19, 2011, 12:22:31 PM (13 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r103250.
​http://trac.webkit.org/changeset/103250
​https://bugs.webkit.org/show_bug.cgi?id=74877

it still breaks codegen (Requested by olliej on #webkit).

Patch by Sheriff Bot <​[email protected]> on 2011-12-19

• dfg/DFGAbstractState.cpp:

(JSC::DFG::AbstractState::execute):

• dfg/DFGByteCodeParser.cpp:

(JSC::DFG::ByteCodeParser::parseBlock):

• dfg/DFGNode.h:
• dfg/DFGPropagator.cpp:

(JSC::DFG::Propagator::propagateArithNodeFlags):
(JSC::DFG::Propagator::fixupNode):
(JSC::DFG::Propagator::byValIsPure):
(JSC::DFG::Propagator::clobbersWorld):
(JSC::DFG::Propagator::getByValLoadElimination):
(JSC::DFG::Propagator::checkStructureLoadElimination):
(JSC::DFG::Propagator::getByOffsetLoadElimination):
(JSC::DFG::Propagator::getPropertyStorageLoadElimination):
(JSC::DFG::Propagator::getIndexedPropertyStorageLoadElimination):
(JSC::DFG::Propagator::performNodeCSE):

• dfg/DFGSpeculativeJIT.cpp:

(JSC::DFG::SpeculativeJIT::compilePutByValForByteArray):
(JSC::DFG::SpeculativeJIT::compilePutByValForIntTypedArray):
(JSC::DFG::SpeculativeJIT::compilePutByValForFloatTypedArray):

• dfg/DFGSpeculativeJIT.h:
• dfg/DFGSpeculativeJIT32_64.cpp:

(JSC::DFG::SpeculativeJIT::compile):

• dfg/DFGSpeculativeJIT64.cpp:

(JSC::DFG::SpeculativeJIT::compile):

File:

• trunk/Source/JavaScriptCore/dfg/DFGAbstractState.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/dfg/DFGAbstractState.cpp

@@ -494 +494 @@
     case PutByVal:
     case PutByValAlias: {
-        NodeIndex child1 = m_graph.m_varArgChildren[node.firstChild()];
-        NodeIndex child2 = m_graph.m_varArgChildren[node.firstChild() + 1];
-        NodeIndex child3 = m_graph.m_varArgChildren[node.firstChild() + 2];
-        PredictedType indexPrediction = m_graph[child2].prediction();
+        PredictedType indexPrediction = m_graph[node.child2()].prediction();
         if (!(indexPrediction & PredictInt32) && indexPrediction) {
             clobberStructures(nodeIndex);
@@ -503 +500 @@
             break;
         }
-        if (m_graph[child1].shouldSpeculateByteArray()) {
-            forNode(child1).filter(PredictByteArray);
-            forNode(child2).filter(PredictInt32);
-            forNode(child3).filter(PredictNumber);
-            break;
-        }
-        
-        if (m_graph[child1].shouldSpeculateInt8Array()) {
-            forNode(child1).filter(PredictInt8Array);
-            forNode(child2).filter(PredictInt32);
-            forNode(child3).filter(PredictNumber);
-            break;
-        }
-        if (m_graph[child1].shouldSpeculateInt16Array()) {
-            forNode(child1).filter(PredictInt16Array);
-            forNode(child2).filter(PredictInt32);
-            forNode(child3).filter(PredictNumber);
-            break;
-        }
-        if (m_graph[child1].shouldSpeculateInt32Array()) {
-            forNode(child1).filter(PredictInt32Array);
-            forNode(child2).filter(PredictInt32);
-            forNode(child3).filter(PredictNumber);
-            break;
-        }
-        if (m_graph[child1].shouldSpeculateUint8Array()) {
-            forNode(child1).filter(PredictUint8Array);
-            forNode(child2).filter(PredictInt32);
-            forNode(child3).filter(PredictNumber);
-            break;
-        }
-        if (m_graph[child1].shouldSpeculateUint16Array()) {
-            forNode(child1).filter(PredictUint16Array);
-            forNode(child2).filter(PredictInt32);
-            forNode(child3).filter(PredictNumber);
-            break;
-        }
-        if (m_graph[child1].shouldSpeculateUint32Array()) {
-            forNode(child1).filter(PredictUint32Array);
-            forNode(child2).filter(PredictInt32);
-            forNode(child3).filter(PredictNumber);
-            break;
-        }
-        if (m_graph[child1].shouldSpeculateFloat32Array()) {
-            forNode(child1).filter(PredictFloat32Array);
-            forNode(child2).filter(PredictInt32);
-            forNode(child3).filter(PredictNumber);
-            break;
-        }
-        if (m_graph[child1].shouldSpeculateFloat64Array()) {
-            forNode(child1).filter(PredictFloat64Array);
-            forNode(child2).filter(PredictInt32);
-            forNode(child3).filter(PredictNumber);
-            break;
-        }
-            
-        forNode(child1).filter(PredictArray);
-        forNode(child2).filter(PredictInt32);
+        if (m_graph[node.child1()].shouldSpeculateByteArray()) {
+            forNode(node.child1()).filter(PredictByteArray);
+            forNode(node.child2()).filter(PredictInt32);
+            forNode(node.child3()).filter(PredictNumber);
+            break;
+        }
+        
+        if (m_graph[node.child1()].shouldSpeculateInt8Array()) {
+            forNode(node.child1()).filter(PredictInt8Array);
+            forNode(node.child2()).filter(PredictInt32);
+            forNode(node.child3()).filter(PredictNumber);
+            break;
+        }
+        if (m_graph[node.child1()].shouldSpeculateInt16Array()) {
+            forNode(node.child1()).filter(PredictInt16Array);
+            forNode(node.child2()).filter(PredictInt32);
+            forNode(node.child3()).filter(PredictNumber);
+            break;
+        }
+        if (m_graph[node.child1()].shouldSpeculateInt32Array()) {
+            forNode(node.child1()).filter(PredictInt32Array);
+            forNode(node.child2()).filter(PredictInt32);
+            forNode(node.child3()).filter(PredictNumber);
+            break;
+        }
+        if (m_graph[node.child1()].shouldSpeculateUint8Array()) {
+            forNode(node.child1()).filter(PredictUint8Array);
+            forNode(node.child2()).filter(PredictInt32);
+            forNode(node.child3()).filter(PredictNumber);
+            break;
+        }
+        if (m_graph[node.child1()].shouldSpeculateUint16Array()) {
+            forNode(node.child1()).filter(PredictUint16Array);
+            forNode(node.child2()).filter(PredictInt32);
+            forNode(node.child3()).filter(PredictNumber);
+            break;
+        }
+        if (m_graph[node.child1()].shouldSpeculateUint32Array()) {
+            forNode(node.child1()).filter(PredictUint32Array);
+            forNode(node.child2()).filter(PredictInt32);
+            forNode(node.child3()).filter(PredictNumber);
+            break;
+        }
+        if (m_graph[node.child1()].shouldSpeculateFloat32Array()) {
+            forNode(node.child1()).filter(PredictFloat32Array);
+            forNode(node.child2()).filter(PredictInt32);
+            forNode(node.child3()).filter(PredictNumber);
+            break;
+        }
+        if (m_graph[node.child1()].shouldSpeculateFloat64Array()) {
+            forNode(node.child1()).filter(PredictFloat64Array);
+            forNode(node.child2()).filter(PredictInt32);
+            forNode(node.child3()).filter(PredictNumber);
+            break;
+        }
+            
+        forNode(node.child1()).filter(PredictArray);
+        forNode(node.child2()).filter(PredictInt32);
         break;
     }