maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Change some llvm::{lower,upper}_bound to llvm::bsearch. NFC 

llvm-svn: 358564
This commit is contained in:
Fangrui Song 2019-04-17 07:58:05 +00:00
parent b0b65cae59
commit c82e92bca8
6 changed files with 34 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
llvm/include/llvm/DebugInfo/DWARF/DWARFUnit.h
View File

@ -462,12 +462,11 @@ public:
DWARFDie getDIEForOffset(uint32_t Offset) {
extractDIEsIfNeeded(false);
assert(!DieArray.empty());
auto it = llvm::lower_bound(
DieArray, Offset, [](const DWARFDebugInfoEntry &LHS, uint32_t Offset) {
return LHS.getOffset() < Offset;
});
if (it != DieArray.end() && it->getOffset() == Offset)
return DWARFDie(this, &*it);
auto It = llvm::bsearch(DieArray, [=](const DWARFDebugInfoEntry &LHS) {
return Offset <= LHS.getOffset();
});
if (It != DieArray.end() && It->getOffset() == Offset)
return DWARFDie(this, &*It);
return DWARFDie();
}

6
llvm/lib/CodeGen/GlobalISel/LegalizerInfo.cpp
View File

@ -506,10 +506,8 @@ LegalizerInfo::findAction(const SizeAndActionsVec &Vec, const uint32_t Size) {
// Find the last element in Vec that has a bitsize equal to or smaller than
// the requested bit size.
// That is the element just before the first element that is bigger than Size.
auto VecIt = llvm::upper_bound(
Vec, Size, [](const uint32_t Size, const SizeAndAction lhs) -> bool {
return Size < lhs.first;
});
auto VecIt = llvm::bsearch(
Vec, [=](const SizeAndAction &A) { return Size < A.first; });
assert(VecIt != Vec.begin() && "Does Vec not start with size 1?");
--VecIt;
int VecIdx = VecIt - Vec.begin();

4
llvm/lib/DebugInfo/DWARF/DWARFDebugAranges.cpp
View File

@ -115,9 +115,7 @@ void DWARFDebugAranges::construct() {
uint32_t DWARFDebugAranges::findAddress(uint64_t Address) const {
RangeCollIterator It =
llvm::upper_bound(Aranges, Address, [](uint64_t LHS, Range RHS) {
return LHS < RHS.HighPC();
});
llvm::bsearch(Aranges, [=](Range RHS) { return Address < RHS.HighPC(); });
if (It != Aranges.end() && It->LowPC <= Address)
return It->CUOffset;
return -1U;

10
llvm/lib/DebugInfo/DWARF/DWARFDebugLoc.cpp
View File

@ -57,9 +57,8 @@ void DWARFDebugLoc::LocationList::dump(raw_ostream &OS, bool IsLittleEndian,
DWARFDebugLoc::LocationList const *
DWARFDebugLoc::getLocationListAtOffset(uint64_t Offset) const {
auto It = llvm::lower_bound(
Locations, Offset,
[](const LocationList &L, uint64_t Offset) { return L.Offset < Offset; });
auto It = llvm::bsearch(
Locations, [=](const LocationList &L) { return Offset <= L.Offset; });
if (It != Locations.end() && It->Offset == Offset)
return &(*It);
return nullptr;
@ -213,9 +212,8 @@ void DWARFDebugLoclists::parse(DataExtractor data, unsigned Version) {
DWARFDebugLoclists::LocationList const *
DWARFDebugLoclists::getLocationListAtOffset(uint64_t Offset) const {
auto It = llvm::lower_bound(
Locations, Offset,
[](const LocationList &L, uint64_t Offset) { return L.Offset < Offset; });
auto It = llvm::bsearch(
Locations, [=](const LocationList &L) { return Offset <= L.Offset; });
if (It != Locations.end() && It->Offset == Offset)
return &(*It);
return nullptr;

7
llvm/lib/DebugInfo/DWARF/DWARFUnitIndex.cpp
View File

@ -172,10 +172,9 @@ DWARFUnitIndex::getFromOffset(uint32_t Offset) const {
E2->Contributions[InfoColumn].Offset;
});
}
auto I =
llvm::upper_bound(OffsetLookup, Offset, [&](uint32_t Offset, Entry *E2) {
return Offset < E2->Contributions[InfoColumn].Offset;
});
auto I = llvm::bsearch(OffsetLookup, [&](Entry *E2) {
return Offset < E2->Contributions[InfoColumn].Offset;
});
if (I == OffsetLookup.begin())
return nullptr;
--I;

41
llvm/tools/llvm-objdump/llvm-objdump.cpp
View File

@ -1045,10 +1045,9 @@ static void disassembleObject(const Target *TheTarget, const ObjectFile *Obj,
error(ExportEntry.getExportRVA(RVA));
uint64_t VA = COFFObj->getImageBase() + RVA;
auto Sec = llvm::upper_bound(
SectionAddresses, VA,
[](uint64_t LHS, const std::pair<uint64_t, SectionRef> &RHS) {
return LHS < RHS.first;
auto Sec = llvm::bsearch(
SectionAddresses, [VA](const std::pair<uint64_t, SectionRef> &RHS) {
return VA < RHS.first;
});
if (Sec != SectionAddresses.begin()) {
--Sec;
@ -1302,35 +1301,33 @@ static void disassembleObject(const Target *TheTarget, const ObjectFile *Obj,
// N.B. We don't walk the relocations in the relocatable case yet.
auto *TargetSectionSymbols = &Symbols;
if (!Obj->isRelocatableObject()) {
auto SectionAddress = llvm::upper_bound(
SectionAddresses, Target,
[](uint64_t LHS, const std::pair<uint64_t, SectionRef> &RHS) {
return LHS < RHS.first;
auto It = llvm::bsearch(
SectionAddresses,
[=](const std::pair<uint64_t, SectionRef> &RHS) {
return Target < RHS.first;
});
if (SectionAddress != SectionAddresses.begin()) {
--SectionAddress;
TargetSectionSymbols = &AllSymbols[SectionAddress->second];
if (It != SectionAddresses.begin()) {
--It;
TargetSectionSymbols = &AllSymbols[It->second];
} else {
TargetSectionSymbols = &AbsoluteSymbols;
}
}
// Find the first symbol in the section whose offset is less than
// Find the last symbol in the section whose offset is less than
// or equal to the target. If there isn't a section that contains
// the target, find the nearest preceding absolute symbol.
auto TargetSym = llvm::upper_bound(
*TargetSectionSymbols, Target,
[](uint64_t LHS,
const std::tuple<uint64_t, StringRef, uint8_t> &RHS) {
return LHS < std::get<0>(RHS);
auto TargetSym = llvm::bsearch(
*TargetSectionSymbols,
[=](const std::tuple<uint64_t, StringRef, uint8_t> &RHS) {
return Target < std::get<0>(RHS);
});
if (TargetSym == TargetSectionSymbols->begin()) {
TargetSectionSymbols = &AbsoluteSymbols;
TargetSym = llvm::upper_bound(
AbsoluteSymbols, Target,
[](uint64_t LHS,
const std::tuple<uint64_t, StringRef, uint8_t> &RHS) {
return LHS < std::get<0>(RHS);
TargetSym = llvm::bsearch(
AbsoluteSymbols,
[=](const std::tuple<uint64_t, StringRef, uint8_t> &RHS) {
return Target < std::get<0>(RHS);
});
}
if (TargetSym != TargetSectionSymbols->begin()) {