Index: llvm/trunk/lib/Target/AArch64/AArch64A57FPLoadBalancing.cpp =================================================================== --- llvm/trunk/lib/Target/AArch64/AArch64A57FPLoadBalancing.cpp +++ llvm/trunk/lib/Target/AArch64/AArch64A57FPLoadBalancing.cpp @@ -375,9 +375,9 @@ // Now we have a set of sets, order them by start address so // we can iterate over them sequentially. - std::sort(V.begin(), V.end(), - [](const std::vector &A, - const std::vector &B) { + llvm::sort(V.begin(), V.end(), + [](const std::vector &A, + const std::vector &B) { return A.front()->startsBefore(B.front()); }); @@ -451,7 +451,7 @@ // change them to! // Final tie-break with instruction order so pass output is stable (i.e. not // dependent on malloc'd pointer values). - std::sort(GV.begin(), GV.end(), [](const Chain *G1, const Chain *G2) { + llvm::sort(GV.begin(), GV.end(), [](const Chain *G1, const Chain *G2) { if (G1->size() != G2->size()) return G1->size() > G2->size(); if (G1->requiresFixup() != G2->requiresFixup())