Changeset 119858 in webkit for trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp

Timestamp:

Jun 8, 2012, 1:02:57 PM (13 years ago)

Author:

[email protected]

Message:

PredictedType should be called SpeculatedType
​https://bugs.webkit.org/show_bug.cgi?id=88477

Unreviewed, fix a renaming goof from ​http://trac.webkit.org/changeset/119660.
I accidentally renamed ByteCodeParser::getPrediction to
ByteCodeParser::getSpeculation. That was not the intent. This changes it
back.

• dfg/DFGByteCodeParser.cpp:

(JSC::DFG::ByteCodeParser::addCall):
(JSC::DFG::ByteCodeParser::getPredictionWithoutOSRExit):
(JSC::DFG::ByteCodeParser::getPrediction):
(JSC::DFG::ByteCodeParser::handleCall):
(JSC::DFG::ByteCodeParser::parseBlock):

File:

• trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp (modified) (15 diffs)

trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp

@@ -732 +732 @@
         if (interpreter->getOpcodeID(putInstruction->u.opcode) == op_call_put_result) {
             m_currentProfilingIndex = m_currentIndex + OPCODE_LENGTH(op_call);
-            prediction = getSpeculation();
+            prediction = getPrediction();
         }
         
@@ -751 +751 @@
     }
     
-    SpeculatedType getSpeculationWithoutOSRExit(NodeIndex nodeIndex, unsigned bytecodeIndex)
+    SpeculatedType getPredictionWithoutOSRExit(NodeIndex nodeIndex, unsigned bytecodeIndex)
     {
         UNUSED_PARAM(nodeIndex);
@@ -763 +763 @@
     }
 
-    SpeculatedType getSpeculation(NodeIndex nodeIndex, unsigned bytecodeIndex)
-    {
-        SpeculatedType prediction = getSpeculationWithoutOSRExit(nodeIndex, bytecodeIndex);
+    SpeculatedType getPrediction(NodeIndex nodeIndex, unsigned bytecodeIndex)
+    {
+        SpeculatedType prediction = getPredictionWithoutOSRExit(nodeIndex, bytecodeIndex);
         
         if (prediction == SpecNone) {
@@ -776 +776 @@
     }
     
-    SpeculatedType getSpeculationWithoutOSRExit()
-    {
-        return getSpeculationWithoutOSRExit(m_graph.size(), m_currentProfilingIndex);
-    }
-    
-    SpeculatedType getSpeculation()
-    {
-        return getSpeculation(m_graph.size(), m_currentProfilingIndex);
+    SpeculatedType getPredictionWithoutOSRExit()
+    {
+        return getPredictionWithoutOSRExit(m_graph.size(), m_currentProfilingIndex);
+    }
+    
+    SpeculatedType getPrediction()
+    {
+        return getPrediction(m_graph.size(), m_currentProfilingIndex);
     }
 
@@ -1156 +1156 @@
             usesResult = true;
             m_currentProfilingIndex = nextOffset;
-            prediction = getSpeculation();
+            prediction = getPrediction();
             nextOffset += OPCODE_LENGTH(op_call_put_result);
         }
@@ -2042 +2042 @@
 
         case op_get_by_val: {
-            SpeculatedType prediction = getSpeculation();
+            SpeculatedType prediction = getPrediction();
             
             NodeIndex base = get(currentInstruction[2].u.operand);
@@ -2067 +2067 @@
             Instruction* getInstruction = currentInstruction + OPCODE_LENGTH(op_method_check);
             
-            SpeculatedType prediction = getSpeculation();
+            SpeculatedType prediction = getPrediction();
             
             ASSERT(interpreter->getOpcodeID(getInstruction->u.opcode) == op_get_by_id);
@@ -2103 +2103 @@
         }
         case op_get_scoped_var: {
-            SpeculatedType prediction = getSpeculation();
+            SpeculatedType prediction = getPrediction();
             int dst = currentInstruction[1].u.operand;
             int slot = currentInstruction[2].u.operand;
@@ -2121 +2121 @@
         }
         case op_get_by_id: {
-            SpeculatedType prediction = getSpeculationWithoutOSRExit();
+            SpeculatedType prediction = getPredictionWithoutOSRExit();
             
             NodeIndex base = get(currentInstruction[2].u.operand);
@@ -2238 +2238 @@
 
         case op_get_global_var: {
-            SpeculatedType prediction = getSpeculation();
+            SpeculatedType prediction = getPrediction();
             
             NodeIndex getGlobalVar = addToGraph(
@@ -2488 +2488 @@
             if (interpreter->getOpcodeID(putInstruction->u.opcode) == op_call_put_result) {
                 m_currentProfilingIndex = m_currentIndex + OPCODE_LENGTH(op_call_varargs);
-                prediction = getSpeculation();
+                prediction = getPrediction();
             }
             
@@ -2523 +2523 @@
 
         case op_resolve: {
-            SpeculatedType prediction = getSpeculation();
+            SpeculatedType prediction = getPrediction();
             
             unsigned identifier = m_inlineStackTop->m_identifierRemap[currentInstruction[2].u.operand];
@@ -2534 +2534 @@
 
         case op_resolve_base: {
-            SpeculatedType prediction = getSpeculation();
+            SpeculatedType prediction = getPrediction();
             
             unsigned identifier = m_inlineStackTop->m_identifierRemap[currentInstruction[2].u.operand];
@@ -2545 +2545 @@
             
         case op_resolve_global: {
-            SpeculatedType prediction = getSpeculation();
+            SpeculatedType prediction = getPrediction();
             
             NodeIndex resolve = addToGraph(ResolveGlobal, OpInfo(m_graph.m_resolveGlobalData.size()), OpInfo(prediction));
@@ -2615 +2615 @@
             set(currentInstruction[1].u.operand,
                 addToGraph(
-                    GetMyArgumentByValSafe, OpInfo(0), OpInfo(getSpeculation()),
+                    GetMyArgumentByValSafe, OpInfo(0), OpInfo(getPrediction()),
                     get(currentInstruction[3].u.operand)));
             NEXT_OPCODE(op_get_argument_by_val);