[Lldb-commits] [lldb] r327224 - [lldb] Unbreak lldb builds due to r327219

Mandeep Singh Grang via lldb-commits lldb-commits at lists.llvm.org
Sat Mar 10 13:13:55 PST 2018

Author: mgrang
Date: Sat Mar 10 13:13:55 2018
New Revision: 327224

URL: http://llvm.org/viewvc/llvm-project?rev=327224&view=rev
[lldb] Unbreak lldb builds due to r327219

r327219 adds wrappers to sort which shuffle the container before sorting.
This causes lldb bots to break as the call to sort is now ambiguous:

So we need use llvm::sort instead of sort to avoid ambiguity with std::sort.

Note: This patch is just to unbreak the bots. I plan to have subsequent patches which will convert all
calls to std::sort to llvm::sort.

Reviewers: RKSimon, k8stone, jingham, labath, zturner

Subscribers: andreadb, lldb-commits

Tags: #lldb

Differential Revision: https://reviews.llvm.org/D44354


Modified: lldb/trunk/source/Breakpoint/Breakpoint.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Breakpoint/Breakpoint.cpp?rev=327224&r1=327223&r2=327224&view=diff
--- lldb/trunk/source/Breakpoint/Breakpoint.cpp (original)
+++ lldb/trunk/source/Breakpoint/Breakpoint.cpp Sat Mar 10 13:13:55 2018
@@ -792,8 +792,8 @@ void Breakpoint::ModuleReplaced(ModuleSP
           // from both maps as we go.
           if (old_id_vec.size() == new_id_vec.size()) {
-            sort(old_id_vec.begin(), old_id_vec.end());
-            sort(new_id_vec.begin(), new_id_vec.end());
+            llvm::sort(old_id_vec.begin(), old_id_vec.end());
+            llvm::sort(new_id_vec.begin(), new_id_vec.end());
             size_t num_elements = old_id_vec.size();
             for (size_t idx = 0; idx < num_elements; idx++) {
               BreakpointLocationSP old_loc_sp =

More information about the lldb-commits mailing list