Changeset 208367 in webkit for trunk/Source/JavaScriptCore/dfg/DFGNode.h

Timestamp:

Nov 3, 2016, 9:38:58 PM (9 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r208364.
​https://bugs.webkit.org/show_bug.cgi?id=164402

broke the build (Requested by smfr on #webkit).

Reverted changeset:

"DFG plays fast and loose with the shadow values of a Phi"
​https://bugs.webkit.org/show_bug.cgi?id=164309
​http://trac.webkit.org/changeset/208364

File:

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

trunk/Source/JavaScriptCore/dfg/DFGNode.h

@@ -2561 +2561 @@
 };
 
-struct NodeComparator {
-    template<typename NodePtrType>
-    bool operator()(NodePtrType a, NodePtrType b) const
-    {
-        return a->index() < b->index();
-    }
-};
+inline bool nodeComparator(Node* a, Node* b)
+{
+    return a->index() < b->index();
+}
 
 template<typename T>
 CString nodeListDump(const T& nodeList)
 {
-    return sortedListDump(nodeList, NodeComparator());
+    return sortedListDump(nodeList, nodeComparator);
 }
 
@@ -2583 +2580 @@
         iter != nodeMap.end(); ++iter)
         keys.append(iter->key);
-    std::sort(keys.begin(), keys.end(), NodeComparator());
+    std::sort(keys.begin(), keys.end(), nodeComparator);
     StringPrintStream out;
     CommaPrinter comma;
@@ -2597 +2594 @@
     T sortedList = nodeValuePairList;
     std::sort(sortedList.begin(), sortedList.end(), [](const V& a, const V& b) {
-        return NodeComparator()(a.node, b.node);
+        return nodeComparator(a.node, b.node);
     });