Changeset 36048 in webkit

Timestamp:

Sep 2, 2008 11:28:44 PM (16 years ago)

Author:

mrowe@apple.com

Message:

2008-09-02 Csaba Osztrogonac <​oszi@inf.u-szeged.hu>

Reviewed by Darin Adler.

Bug 20296: OpcodeStats doesn't build on platforms which don't have mergesort().
<​https://bugs.webkit.org/show_bug.cgi?id=20296>

• VM/Opcode.cpp: (KJS::OpcodeStats::~OpcodeStats): mergesort() replaced with qsort()

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• VM/Opcode.cpp (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-09-02  Csaba Osztrogonac  <oszi@inf.u-szeged.hu>
+
+        Reviewed by Darin Adler.
+
+        Bug 20296: OpcodeStats doesn't build on platforms which don't have mergesort().
+        <https://bugs.webkit.org/show_bug.cgi?id=20296>
+
+        * VM/Opcode.cpp:
+        (KJS::OpcodeStats::~OpcodeStats): mergesort() replaced with qsort()
+
 2008-09-02  Geoffrey Garen  <ggaren@apple.com>
 

trunk/JavaScriptCore/VM/Opcode.cpp

@@ -105 +105 @@
     for (int i = 0; i < numOpcodeIDs; ++i)
         sortedIndices[i] = i;
-    mergesort(sortedIndices, numOpcodeIDs, sizeof(int), compareOpcodeIndices);
+    qsort(sortedIndices, numOpcodeIDs, sizeof(int), compareOpcodeIndices);
     
     pair<int, int> sortedPairIndices[numOpcodeIDs * numOpcodeIDs];
@@ -112 +112 @@
         for (int j = 0; j < numOpcodeIDs; ++j)
             *(currentPairIndex++) = make_pair(i, j);
-    mergesort(sortedPairIndices, numOpcodeIDs * numOpcodeIDs, sizeof(pair<int, int>), compareOpcodePairIndices);
+    qsort(sortedPairIndices, numOpcodeIDs * numOpcodeIDs, sizeof(pair<int, int>), compareOpcodePairIndices);
     
     printf("\nExecuted opcode statistics\n");