Changeset 145323 in webkit for trunk/Source/JavaScriptCore/dfg/DFGVariableAccessData.h

Timestamp:

Mar 9, 2013, 2:48:09 PM (12 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r145299.
​http://trac.webkit.org/changeset/145299
​https://bugs.webkit.org/show_bug.cgi?id=111928

compilation failure with recent clang
(DFGBackwardsPropagationPhase.cpp:132:35: error: comparison of
constant 10 with expression of type 'bool' is always false)
(Requested by thorton on #webkit).

Patch by Sheriff Bot <​[email protected]> on 2013-03-09

Source/JavaScriptCore:

• CMakeLists.txt:
• GNUmakefile.list.am:
• JavaScriptCore.xcodeproj/project.pbxproj:
• Target.pri:
• dfg/DFGArrayMode.cpp:

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

• dfg/DFGBackwardsPropagationPhase.cpp: Removed.
• dfg/DFGBackwardsPropagationPhase.h: Removed.
• dfg/DFGCPSRethreadingPhase.cpp:

(JSC::DFG::CPSRethreadingPhase::run):
(CPSRethreadingPhase):
(JSC::DFG::CPSRethreadingPhase::canonicalizeGetLocalFor):
(JSC::DFG::CPSRethreadingPhase::canonicalizeFlushOrPhantomLocalFor):

• dfg/DFGDriver.cpp:

(JSC::DFG::compile):

• dfg/DFGGraph.cpp:

(JSC::DFG::Graph::dump):

• dfg/DFGNodeFlags.cpp:

(JSC::DFG::nodeFlagsAsString):
(DFG):

• dfg/DFGNodeFlags.h:

(DFG):

• dfg/DFGPredictionPropagationPhase.cpp:

(JSC::DFG::PredictionPropagationPhase::isNotNegZero):
(PredictionPropagationPhase):
(JSC::DFG::PredictionPropagationPhase::isNotZero):
(JSC::DFG::PredictionPropagationPhase::isWithinPowerOfTwoForConstant):
(JSC::DFG::PredictionPropagationPhase::isWithinPowerOfTwoNonRecursive):
(JSC::DFG::PredictionPropagationPhase::isWithinPowerOfTwo):
(JSC::DFG::PredictionPropagationPhase::propagate):
(JSC::DFG::PredictionPropagationPhase::mergeDefaultFlags):

• dfg/DFGUnificationPhase.cpp:

(JSC::DFG::UnificationPhase::run):

• dfg/DFGVariableAccessData.h:

(JSC::DFG::VariableAccessData::VariableAccessData):
(VariableAccessData):

LayoutTests:

• fast/js/dfg-arith-add-overflow-check-elimination-predicted-but-not-proven-int-expected.txt: Removed.
• fast/js/dfg-arith-add-overflow-check-elimination-predicted-but-not-proven-int.html: Removed.
• fast/js/dfg-arith-add-overflow-check-elimination-tower-of-large-numbers-expected.txt: Removed.
• fast/js/dfg-arith-add-overflow-check-elimination-tower-of-large-numbers.html: Removed.
• fast/js/jsc-test-list:
• fast/js/script-tests/dfg-arith-add-overflow-check-elimination-predicted-but-not-proven-int.js: Removed.
• fast/js/script-tests/dfg-arith-add-overflow-check-elimination-tower-of-large-numbers.js: Removed.

File:

• trunk/Source/JavaScriptCore/dfg/DFGVariableAccessData.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/dfg/DFGVariableAccessData.h

@@ -52 +52 @@
         , m_structureCheckHoistingFailed(false)
         , m_isProfitableToUnbox(false)
-        , m_isLoadedFrom(false)
         , m_doubleFormatState(EmptyDoubleFormatState)
     {
@@ -151 +150 @@
     }
     
-    bool mergeIsLoadedFrom(bool isLoadedFrom)
-    {
-        return checkAndSet(m_isLoadedFrom, m_isLoadedFrom | isLoadedFrom);
-    }
-    
-    void setIsLoadedFrom(bool isLoadedFrom)
-    {
-        m_isLoadedFrom = isLoadedFrom;
-    }
-    
-    bool isLoadedFrom()
-    {
-        return m_isLoadedFrom;
-    }
-    
     bool predict(SpeculatedType prediction)
     {
@@ -323 +307 @@
     bool m_structureCheckHoistingFailed;
     bool m_isProfitableToUnbox;
-    bool m_isLoadedFrom;
 
     float m_votes[2]; // Used primarily for double voting but may be reused for other purposes.