Changeset 165098 in webkit for trunk/Source/JavaScriptCore/dfg/DFGArrayMode.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/DFGArrayMode.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/dfg/DFGArrayMode.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2012, 2013, 2014 Apple Inc. All rights reserved.
+ * Copyright (C) 2012, 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -133 +133 @@
 
 ArrayMode ArrayMode::refine(
-    Graph& graph, Node* node,
+    Graph& graph, CodeOrigin codeOrigin,
     SpeculatedType base, SpeculatedType index, SpeculatedType value,
     NodeFlags flags) const
@@ -200 +200 @@
         
         ArrayMode result;
-        switch (node->op()) {
-        case PutByVal:
-            if (graph.hasExitSite(node->origin.semantic, OutOfBounds) || !isInBounds())
-                result = withSpeculation(Array::OutOfBounds);
-            else
-                result = withSpeculation(Array::InBounds);
-            break;
-            
-        default:
+        if (graph.hasExitSite(codeOrigin, OutOfBounds) || !isInBounds())
+            result = withSpeculation(Array::OutOfBounds);
+        else
             result = withSpeculation(Array::InBounds);
-            break;
-        }
         
         if (isInt8ArraySpeculation(base))