Changeset 145323 in webkit for trunk/Source/JavaScriptCore/dfg/DFGNodeFlags.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/DFGNodeFlags.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/dfg/DFGNodeFlags.h

@@ -31 +31 @@
 #if ENABLE(DFG_JIT)
 
-#include <wtf/PrintStream.h>
 #include <wtf/StdLibExtras.h>
 
@@ -61 +60 @@
 #define NodeUsedAsValue          (NodeUsedAsNumber | NodeNeedsNegZero | NodeUsedAsOther)
 #define NodeUsedAsInt            0x1000 // The result of this computation is known to be used in a context that prefers, but does not require, integer values.
+#define NodeUsedAsIntLocally     0x2000 // Same as NodeUsedAsInt, but within the same basic block.
 
 #define NodeArithFlagsMask       (NodeBehaviorMask | NodeBackPropMask)
 
-#define NodeDoesNotExit          0x2000 // This flag is negated to make it natural for the default to be that a node does exit.
+#define NodeDoesNotExit          0x4000 // This flag is negated to make it natural for the default to be that a node does exit.
 
-#define NodeRelevantToOSR        0x4000
+#define NodeRelevantToOSR        0x8000
 
-#define NodeExitsForward         0x8000
+#define NodeExitsForward        0x10000
 
 typedef uint32_t NodeFlags;
@@ -103 +103 @@
 }
 
-void dumpNodeFlags(PrintStream&, NodeFlags);
-MAKE_PRINT_ADAPTOR(NodeFlagsDump, NodeFlags, dumpNodeFlags);
+const char* nodeFlagsAsString(NodeFlags);
 
 } } // namespace JSC::DFG