Use llvm::stable_sort
While touching the code, simplify if feasible.
llvm-svn: 358996
diff --git a/llvm/lib/MC/MCDwarf.cpp b/llvm/lib/MC/MCDwarf.cpp
index e8edf6b..aae6fdf 100644
--- a/llvm/lib/MC/MCDwarf.cpp
+++ b/llvm/lib/MC/MCDwarf.cpp
@@ -1865,11 +1865,10 @@
// but the Android libunwindstack rejects eh_frame sections where
// an FDE refers to a CIE other than the closest previous CIE.
std::vector<MCDwarfFrameInfo> FrameArrayX(FrameArray.begin(), FrameArray.end());
- std::stable_sort(
- FrameArrayX.begin(), FrameArrayX.end(),
- [&](const MCDwarfFrameInfo &X, const MCDwarfFrameInfo &Y) -> bool {
- return CIEKey(X) < CIEKey(Y);
- });
+ llvm::stable_sort(FrameArrayX,
+ [](const MCDwarfFrameInfo &X, const MCDwarfFrameInfo &Y) {
+ return CIEKey(X) < CIEKey(Y);
+ });
for (auto I = FrameArrayX.begin(), E = FrameArrayX.end(); I != E;) {
const MCDwarfFrameInfo &Frame = *I;
++I;
diff --git a/llvm/lib/MC/WasmObjectWriter.cpp b/llvm/lib/MC/WasmObjectWriter.cpp
index 2994772..dab5bb3 100644
--- a/llvm/lib/MC/WasmObjectWriter.cpp
+++ b/llvm/lib/MC/WasmObjectWriter.cpp
@@ -934,9 +934,8 @@
// order, but for the code section we combine many MC sections into single
// wasm section, and this order is determined by the order of Asm.Symbols()
// not the sections order.
- std::stable_sort(
- Relocs.begin(), Relocs.end(),
- [](const WasmRelocationEntry &A, const WasmRelocationEntry &B) {
+ llvm::stable_sort(
+ Relocs, [](const WasmRelocationEntry &A, const WasmRelocationEntry &B) {
return (A.Offset + A.FixupSection->getSectionOffset()) <
(B.Offset + B.FixupSection->getSectionOffset());
});