Changeset 194423 in webkit

Timestamp:

Dec 26, 2015, 10:27:03 PM (11 years ago)

Author:

mark.lam@apple.com

Message:

Rename NodeMayOverflowInXXX to NodeMayOverflowInt32InXXX.
​https://bugs.webkit.org/show_bug.cgi?id=152555

Reviewed by Alex Christensen.

That's because the NodeMayOverflowInBaseline and NodeMayOverflowInDFG flags only
indicates potential overflowing of Int32 values. We'll be adding overflow
profiling for Int52 values later, and we should disambiguate between the 2 types.

This is purely a renaming patch. There are no semantic changes.

• dfg/DFGByteCodeParser.cpp:

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

• dfg/DFGNodeFlags.cpp:

(JSC::DFG::dumpNodeFlags):

• dfg/DFGNodeFlags.h:

(JSC::DFG::nodeMayOverflowInt32):
(JSC::DFG::nodeCanSpeculateInt32):
(JSC::DFG::nodeMayOverflow): Deleted.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• dfg/DFGByteCodeParser.cpp (modified) (7 diffs)
• dfg/DFGNodeFlags.cpp (modified) (1 diff)
• dfg/DFGNodeFlags.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2015-12-26  Mark Lam  <mark.lam@apple.com>
+
+        Rename NodeMayOverflowInXXX to NodeMayOverflowInt32InXXX.
+        https://bugs.webkit.org/show_bug.cgi?id=152555
+
+        Reviewed by Alex Christensen.
+
+        That's because the NodeMayOverflowInBaseline and NodeMayOverflowInDFG flags only
+        indicates potential overflowing of Int32 values.  We'll be adding overflow
+        profiling for Int52 values later, and we should disambiguate between the 2 types.
+
+        This is purely a renaming patch.  There are no semantic changes.
+
+        * dfg/DFGByteCodeParser.cpp:
+        (JSC::DFG::ByteCodeParser::makeSafe):
+        (JSC::DFG::ByteCodeParser::makeDivSafe):
+        (JSC::DFG::ByteCodeParser::handleIntrinsicCall):
+        * dfg/DFGNodeFlags.cpp:
+        (JSC::DFG::dumpNodeFlags):
+        * dfg/DFGNodeFlags.h:
+        (JSC::DFG::nodeMayOverflowInt32):
+        (JSC::DFG::nodeCanSpeculateInt32):
+        (JSC::DFG::nodeMayOverflow): Deleted.
+
 2015-12-23  Andreas Kling  <akling@apple.com>
 

trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp

@@ -883 +883 @@
     {
         if (m_inlineStackTop->m_exitProfile.hasExitSite(m_currentIndex, Overflow))
-            node->mergeFlags(NodeMayOverflowInDFG);
+            node->mergeFlags(NodeMayOverflowInt32InDFG);
         if (m_inlineStackTop->m_exitProfile.hasExitSite(m_currentIndex, NegativeZero))
             node->mergeFlags(NodeMayNegZeroInDFG);
@@ -899 +899 @@
         case ValueAdd:
         case ArithMod: // for ArithMod "MayOverflow" means we tried to divide by zero, or we saw double.
-            node->mergeFlags(NodeMayOverflowInBaseline);
+            node->mergeFlags(NodeMayOverflowInt32InBaseline);
             break;
             
@@ -906 +906 @@
             // (i.e. -(1 << 31)) or generating negative zero (i.e. -0). If it took slow
             // path then we assume that it did both of those things.
-            node->mergeFlags(NodeMayOverflowInBaseline);
+            node->mergeFlags(NodeMayOverflowInt32InBaseline);
             node->mergeFlags(NodeMayNegZeroInBaseline);
             break;
@@ -916 +916 @@
             if (m_inlineStackTop->m_profiledBlock->likelyToTakeDeepestSlowCase(m_currentIndex)
                 || m_inlineStackTop->m_exitProfile.hasExitSite(m_currentIndex, Overflow))
-                node->mergeFlags(NodeMayOverflowInBaseline | NodeMayNegZeroInBaseline);
+                node->mergeFlags(NodeMayOverflowInt32InBaseline | NodeMayNegZeroInBaseline);
             else if (m_inlineStackTop->m_profiledBlock->likelyToTakeSlowCase(m_currentIndex)
                 || m_inlineStackTop->m_exitProfile.hasExitSite(m_currentIndex, NegativeZero))
@@ -935 +935 @@
         
         if (m_inlineStackTop->m_exitProfile.hasExitSite(m_currentIndex, Overflow))
-            node->mergeFlags(NodeMayOverflowInDFG);
+            node->mergeFlags(NodeMayOverflowInt32InDFG);
         if (m_inlineStackTop->m_exitProfile.hasExitSite(m_currentIndex, NegativeZero))
             node->mergeFlags(NodeMayNegZeroInDFG);
@@ -949 +949 @@
         
         // FIXME: It might be possible to make this more granular.
-        node->mergeFlags(NodeMayOverflowInBaseline | NodeMayNegZeroInBaseline);
+        node->mergeFlags(NodeMayOverflowInt32InBaseline | NodeMayNegZeroInBaseline);
         
         return node;
@@ -2011 +2011 @@
         Node* node = addToGraph(ArithAbs, get(virtualRegisterForArgument(1, registerOffset)));
         if (m_inlineStackTop->m_exitProfile.hasExitSite(m_currentIndex, Overflow))
-            node->mergeFlags(NodeMayOverflowInDFG);
+            node->mergeFlags(NodeMayOverflowInt32InDFG);
         set(VirtualRegister(resultOperand), node);
         return true;

trunk/Source/JavaScriptCore/dfg/DFGNodeFlags.cpp

@@ -85 +85 @@
             out.print(comma, "UseAsOther");
     }
-    
-    if (flags & NodeMayOverflowInBaseline)
-        out.print(comma, "MayOverflowInBaseline");
-    
-    if (flags & NodeMayOverflowInDFG)
-        out.print(comma, "MayOverflowInDFG");
-    
+
+    if (flags & NodeMayOverflowInt32InBaseline)
+        out.print(comma, "MayOverflowInt32InBaseline");
+
+    if (flags & NodeMayOverflowInt32InDFG)
+        out.print(comma, "MayOverflowInt32InDFG");
+
     if (flags & NodeMayNegZeroInBaseline)
         out.print(comma, "MayNegZeroInBaseline");

trunk/Source/JavaScriptCore/dfg/DFGNodeFlags.h

@@ -50 +50 @@
                                 
 #define NodeBehaviorMask                 0x0780
-#define NodeMayOverflowInBaseline        0x0080
-#define NodeMayOverflowInDFG             0x0100
+#define NodeMayOverflowInt32InBaseline   0x0080
+#define NodeMayOverflowInt32InDFG        0x0100
 #define NodeMayNegZeroInBaseline         0x0200
 #define NodeMayNegZeroInDFG              0x0400
@@ -95 +95 @@
 };
 
-static inline bool nodeMayOverflow(NodeFlags flags, RareCaseProfilingSource source)
+static inline bool nodeMayOverflowInt32(NodeFlags flags, RareCaseProfilingSource source)
 {
     NodeFlags mask = 0;
     switch (source) {
     case BaselineRareCase:
-        mask = NodeMayOverflowInBaseline;
+        mask = NodeMayOverflowInt32InBaseline;
         break;
     case DFGRareCase:
-        mask = NodeMayOverflowInDFG;
+        mask = NodeMayOverflowInt32InDFG;
         break;
     case AllRareCases:
-        mask = NodeMayOverflowInBaseline | NodeMayOverflowInDFG;
+        mask = NodeMayOverflowInt32InBaseline | NodeMayOverflowInt32InDFG;
         break;
     }
@@ -131 +131 @@
 static inline bool nodeCanSpeculateInt32(NodeFlags flags, RareCaseProfilingSource source)
 {
-    if (nodeMayOverflow(flags, source))
+    if (nodeMayOverflowInt32(flags, source))
         return !bytecodeUsesAsNumber(flags);