Changeset 111781 in webkit for trunk/Source/JavaScriptCore/dfg/DFGNodeFlags.cpp

Timestamp:

Mar 22, 2012, 4:24:40 PM (13 years ago)

Author:

[email protected]

Message:

DFG NodeFlags has some duplicate code and naming issues
​https://bugs.webkit.org/show_bug.cgi?id=81975

Reviewed by Gavin Barraclough.

Removed most references to "ArithNodeFlags" since those are now just part
of the node flags. Fixed some renaming goofs (EdgedAsNum is once again
NodeUsedAsNum). Got rid of setArithNodeFlags() and mergeArithNodeFlags()
because the former was never called and the latter did the same things as
mergeFlags().

• dfg/DFGByteCodeParser.cpp:

(JSC::DFG::ByteCodeParser::makeSafe):
(JSC::DFG::ByteCodeParser::makeDivSafe):
(JSC::DFG::ByteCodeParser::handleIntrinsic):

• dfg/DFGGraph.cpp:

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

• dfg/DFGNode.h:

(JSC::DFG::Node::arithNodeFlags):
(Node):

• dfg/DFGNodeFlags.cpp:

(JSC::DFG::nodeFlagsAsString):

• dfg/DFGNodeFlags.h:

(DFG):
(JSC::DFG::nodeUsedAsNumber):

• dfg/DFGPredictionPropagationPhase.cpp:

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

File:

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

trunk/Source/JavaScriptCore/dfg/DFGNodeFlags.cpp

@@ -33 +33 @@
 namespace JSC { namespace DFG {
 
-const char* arithNodeFlagsAsString(NodeFlags flags)
+const char* nodeFlagsAsString(NodeFlags flags)
 {
-    flags &= NodeArithMask;
-    
     if (!flags)
         return "<empty>";
 
-    static const int size = 64;
+    static const int size = 128;
     static char description[size];
     BoundsCheckedPointer<char> ptr(description, size);
@@ -46 +44 @@
     bool hasPrinted = false;
     
-    if (flags & EdgedAsNumber) {
+    if (flags & NodeResultMask) {
+        switch (flags & NodeResultMask) {
+        case NodeResultJS:
+            ptr.strcat("ResultJS");
+            break;
+        case NodeResultNumber:
+            ptr.strcat("ResultNumber");
+            break;
+        case NodeResultInt32:
+            ptr.strcat("ResultInt32");
+            break;
+        case NodeResultBoolean:
+            ptr.strcat("ResultBoolean");
+            break;
+        case NodeResultStorage:
+            ptr.strcat("ResultStorage");
+            break;
+        default:
+            ASSERT_NOT_REACHED();
+            break;
+        }
+        hasPrinted = true;
+    }
+    
+    if (flags & NodeMustGenerate) {
+        if (hasPrinted)
+            ptr.strcat("|");
+        ptr.strcat("MustGenerate");
+        hasPrinted = true;
+    }
+    
+    if (flags & NodeHasVarArgs) {
+        if (hasPrinted)
+            ptr.strcat("|");
+        ptr.strcat("HasVarArgs");
+        hasPrinted = true;
+    }
+    
+    if (flags & NodeClobbersWorld) {
+        if (hasPrinted)
+            ptr.strcat("|");
+        ptr.strcat("ClobbersWorld");
+        hasPrinted = true;
+    }
+    
+    if (flags & NodeMightClobber) {
+        if (hasPrinted)
+            ptr.strcat("|");
+        ptr.strcat("MightClobber");
+        hasPrinted = true;
+    }
+    
+    if (flags & NodeUsedAsNumber) {
+        if (hasPrinted)
+            ptr.strcat("|");
         ptr.strcat("UsedAsNum");
         hasPrinted = true;