Changeset 165098 in webkit for trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp

Timestamp:

Mar 4, 2014, 11:25:02 PM (11 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r165085.
​http://trac.webkit.org/changeset/165085
​https://bugs.webkit.org/show_bug.cgi?id=129729

Broke imported/w3c/html-templates/template-element/template-
content.html (Requested by ap on #webkit).

Source/JavaScriptCore:

• bytecode/SpeculatedType.cpp:

(JSC::speculationToAbbreviatedString):

• bytecode/SpeculatedType.h:
• dfg/DFGAbstractInterpreterInlines.h:

(JSC::DFG::AbstractInterpreter<AbstractStateType>::executeEffects):

• dfg/DFGArrayMode.cpp:

(JSC::DFG::ArrayMode::refine):

• dfg/DFGArrayMode.h:
• dfg/DFGFixupPhase.cpp:

(JSC::DFG::FixupPhase::fixupNode):
(JSC::DFG::FixupPhase::attemptToMakeGetArrayLength):

• dfg/DFGNode.h:

(JSC::DFG::Node::shouldSpeculateBoolean):

• dfg/DFGSafeToExecute.h:

(JSC::DFG::SafeToExecuteEdge::operator()):

• dfg/DFGSpeculativeJIT.cpp:

(JSC::DFG::SpeculativeJIT::compileStrictEq):
(JSC::DFG::SpeculativeJIT::speculate):

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

(WTF::printInternal):

• dfg/DFGUseKind.h:

(JSC::DFG::typeFilterFor):

• ftl/FTLCapabilities.cpp:

(JSC::FTL::canCompile):

• ftl/FTLLowerDFGToLLVM.cpp:

(JSC::FTL::LowerDFGToLLVM::compileNode):
(JSC::FTL::LowerDFGToLLVM::compileCompareEq):
(JSC::FTL::LowerDFGToLLVM::compileCompareStrictEq):
(JSC::FTL::LowerDFGToLLVM::speculate):

• tests/stress/float32-array-out-of-bounds.js: Removed.
• tests/stress/weird-equality-folding-cases.js: Removed.

LayoutTests:

• js/regress/fold-strict-eq-expected.txt: Removed.
• js/regress/fold-strict-eq.html: Removed.
• js/regress/misc-strict-eq-expected.txt: Removed.
• js/regress/misc-strict-eq.html: Removed.
• js/regress/script-tests/fold-strict-eq.js: Removed.
• js/regress/script-tests/misc-strict-eq.js: Removed.

File:

• trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp

@@ -3803 +3803 @@
     }
         
-    case MiscUse: {
-        compileMiscStrictEq(node);
-        return false;
-    }
-        
     case UntypedUse: {
         return nonSpeculativeStrictEq(node);
@@ -4836 +4831 @@
 }
 
-void SpeculativeJIT::speculateMisc(Edge edge, JSValueRegs regs)
-{
-#if USE(JSVALUE64)
-    typeCheck(
-        regs, edge, SpecMisc,
-        m_jit.branch64(MacroAssembler::Above, regs.gpr(), MacroAssembler::TrustedImm64(TagBitTypeOther | TagBitBool | TagBitUndefined)));
-#else
-    typeCheck(
-        regs, edge, SpecMisc | SpecInt32,
-        m_jit.branch32(MacroAssembler::Equal, regs.tagGPR(), MacroAssembler::TrustedImm32(JSValue::Int32Tag)));
-    typeCheck(
-        regs, edge, SpecMisc,
-        m_jit.branch32(MacroAssembler::Below, regs.tagGPR(), MacroAssembler::TrustedImm32(JSValue::UndefinedTag)));
-#endif
-}
-
-void SpeculativeJIT::speculateMisc(Edge edge)
-{
-    if (!needsTypeCheck(edge, SpecMisc))
-        return;
-    
-    JSValueOperand operand(this, edge, ManualOperandSpeculation);
-    speculateMisc(edge, operand.jsValueRegs());
-}
-
 void SpeculativeJIT::speculate(Node*, Edge edge)
 {
@@ -4922 +4892 @@
     case OtherUse:
         speculateOther(edge);
-        break;
-    case MiscUse:
-        speculateMisc(edge);
         break;
     default: