Skip to content

Commit d1cd688

Browse files
[llvm] Use llvm::is_sorted (NFC) (#140399)
1 parent c51417d commit d1cd688

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

llvm/lib/CodeGen/MachineScheduler.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4917,8 +4917,7 @@ unsigned ResourceSegments::getFirstAvailableAt(
49174917
unsigned CurrCycle, unsigned AcquireAtCycle, unsigned ReleaseAtCycle,
49184918
std::function<ResourceSegments::IntervalTy(unsigned, unsigned, unsigned)>
49194919
IntervalBuilder) const {
4920-
assert(std::is_sorted(std::begin(_Intervals), std::end(_Intervals),
4921-
sortIntervals) &&
4920+
assert(llvm::is_sorted(_Intervals, sortIntervals) &&
49224921
"Cannot execute on an un-sorted set of intervals.");
49234922

49244923
// Zero resource usage is allowed by TargetSchedule.td but we do not construct

llvm/lib/Target/AMDGPU/SIFrameLowering.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1748,11 +1748,12 @@ static void assignSlotsUsingVGPRBlocks(MachineFunction &MF,
17481748
MachineFrameInfo &MFI = MF.getFrameInfo();
17491749
const SIRegisterInfo *TRI = ST.getRegisterInfo();
17501750

1751-
assert(std::is_sorted(CSI.begin(), CSI.end(),
1752-
[](const CalleeSavedInfo &A, const CalleeSavedInfo &B) {
1753-
return A.getReg() < B.getReg();
1754-
}) &&
1755-
"Callee saved registers not sorted");
1751+
assert(
1752+
llvm::is_sorted(CSI,
1753+
[](const CalleeSavedInfo &A, const CalleeSavedInfo &B) {
1754+
return A.getReg() < B.getReg();
1755+
}) &&
1756+
"Callee saved registers not sorted");
17561757

17571758
auto CanUseBlockOps = [&](const CalleeSavedInfo &CSI) {
17581759
return !CSI.isSpilledToReg() &&

0 commit comments

Comments
 (0)