Changeset 221143 in webkit for trunk/Source/JavaScriptCore/dfg/DFGJITCode.cpp

Timestamp:

Aug 24, 2017, 9:59:00 AM (8 years ago)

Author:

[email protected]

Message:

DFG::JITCode::osrEntry should get sorted since we perform a binary search on it
​https://bugs.webkit.org/show_bug.cgi?id=175893

Reviewed by Mark Lam.

• dfg/DFGJITCode.cpp:

(JSC::DFG::JITCode::finalizeOSREntrypoints):

• dfg/DFGJITCode.h:

(JSC::DFG::JITCode::finalizeCatchOSREntrypoints): Deleted.

• dfg/DFGSpeculativeJIT.cpp:

(JSC::DFG::SpeculativeJIT::linkOSREntries):

File:

• trunk/Source/JavaScriptCore/dfg/DFGJITCode.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/dfg/DFGJITCode.cpp

@@ -239 +239 @@
 }
 
+void JITCode::finalizeOSREntrypoints()
+{
+    auto comparator = [] (const auto& a, const auto& b) {
+        return a.m_bytecodeIndex < b.m_bytecodeIndex;
+    };
+    std::sort(catchEntrypoints.begin(), catchEntrypoints.end(), comparator);
+    std::sort(osrEntry.begin(), osrEntry.end(), comparator);
+
+#if !ASSERT_DISABLED
+    auto verifyIsSorted = [&] (auto& osrVector) {
+        for (unsigned i = 0; i + 1 < osrVector.size(); ++i)
+            ASSERT(osrVector[i].m_bytecodeIndex <= osrVector[i + 1].m_bytecodeIndex);
+    };
+    verifyIsSorted(catchEntrypoints);
+    verifyIsSorted(osrEntry);
+#endif
+}
+
 } } // namespace JSC::DFG