Changeset 142695 in webkit for trunk/Source/JavaScriptCore/dfg/DFGPredictionPropagationPhase.cpp

Timestamp:

Feb 12, 2013, 5:25:27 PM (13 years ago)

Author:

[email protected]

Message:

Renamed SpecObjectMask to SpecObject.

Rubber stamped by Mark Hahnenberg.

"SpecObjectMask" is a weird name considering that a bunch of the other speculated
types are also masks, but don't have "Mask" in the name.

• bytecode/SpeculatedType.h:

(JSC):
(JSC::isObjectSpeculation):
(JSC::isObjectOrOtherSpeculation):

• dfg/DFGAbstractState.cpp:

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

• dfg/DFGPredictionPropagationPhase.cpp:

(JSC::DFG::PredictionPropagationPhase::propagate):

• dfg/DFGSpeculativeJIT.cpp:

(JSC::DFG::SpeculativeJIT::compilePeepHoleObjectEquality):

• dfg/DFGSpeculativeJIT32_64.cpp:

(JSC::DFG::SpeculativeJIT::compileObjectEquality):
(JSC::DFG::SpeculativeJIT::compileObjectToObjectOrOtherEquality):
(JSC::DFG::SpeculativeJIT::compilePeepHoleObjectToObjectOrOtherEquality):

• dfg/DFGSpeculativeJIT64.cpp:

(JSC::DFG::SpeculativeJIT::compileObjectEquality):
(JSC::DFG::SpeculativeJIT::compileObjectToObjectOrOtherEquality):
(JSC::DFG::SpeculativeJIT::compilePeepHoleObjectToObjectOrOtherEquality):

File:

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

trunk/Source/JavaScriptCore/dfg/DFGPredictionPropagationPhase.cpp

@@ -593 +593 @@
             SpeculatedType prediction = node->child1()->prediction();
             if (prediction) {
-                if (prediction & ~SpecObjectMask) {
-                    prediction &= SpecObjectMask;
+                if (prediction & ~SpecObject) {
+                    prediction &= SpecObject;
                     prediction = mergeSpeculations(prediction, SpecObjectOther);
                 }
@@ -689 +689 @@
                 if (isObjectSpeculation(child)) {
                     // I'd love to fold this case into the case below, but I can't, because
-                    // removing SpecObjectMask from something that only has an object
+                    // removing SpecObject from something that only has an object
                     // prediction and nothing else means we have an ill-formed SpeculatedType
                     // (strong predict-none). This should be killed once we remove all traces
                     // of static (aka weak) predictions.
                     changed |= mergePrediction(SpecString);
-                } else if (child & SpecObjectMask) {
+                } else if (child & SpecObject) {
                     // Objects get turned into strings. So if the input has hints of objectness,
                     // the output will have hinsts of stringiness.
                     changed |= mergePrediction(
-                        mergeSpeculations(child & ~SpecObjectMask, SpecString));
+                        mergeSpeculations(child & ~SpecObject, SpecString));
                 } else
                     changed |= mergePrediction(child);