diff --git a/llvm/include/llvm/ExecutionEngine/JITLink/JITLink.h b/llvm/include/llvm/ExecutionEngine/JITLink/JITLink.h --- a/llvm/include/llvm/ExecutionEngine/JITLink/JITLink.h +++ b/llvm/include/llvm/ExecutionEngine/JITLink/JITLink.h @@ -774,7 +774,7 @@ public: SectionRange() = default; SectionRange(const Section &Sec) { - if (llvm::empty(Sec.blocks())) + if (Sec.blocks().empty()) return; First = Last = *Sec.blocks().begin(); for (auto *B : Sec.blocks()) { diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfFile.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfFile.cpp --- a/llvm/lib/CodeGen/AsmPrinter/DwarfFile.cpp +++ b/llvm/lib/CodeGen/AsmPrinter/DwarfFile.cpp @@ -42,7 +42,7 @@ // Skip CUs that ended up not being needed (split CUs that were abandoned // because they added no information beyond the non-split CU) - if (llvm::empty(TheU->getUnitDie().values())) + if (TheU->getUnitDie().values().empty()) return; Asm->OutStreamer->switchSection(S); @@ -66,7 +66,7 @@ // Skip CUs that ended up not being needed (split CUs that were abandoned // because they added no information beyond the non-split CU) - if (llvm::empty(TheU->getUnitDie().values())) + if (TheU->getUnitDie().values().empty()) return; TheU->setDebugSectionOffset(SecOffset); diff --git a/llvm/lib/ExecutionEngine/JITLink/JITLink.cpp b/llvm/lib/ExecutionEngine/JITLink/JITLink.cpp --- a/llvm/lib/ExecutionEngine/JITLink/JITLink.cpp +++ b/llvm/lib/ExecutionEngine/JITLink/JITLink.cpp @@ -309,14 +309,14 @@ } OS << "Absolute symbols:\n"; - if (!llvm::empty(absolute_symbols())) { + if (!absolute_symbols().empty()) { for (auto *Sym : absolute_symbols()) OS << " " << Sym->getAddress() << ": " << *Sym << "\n"; } else OS << " none\n"; OS << "\nExternal symbols:\n"; - if (!llvm::empty(external_symbols())) { + if (!external_symbols().empty()) { for (auto *Sym : external_symbols()) OS << " " << Sym->getAddress() << ": " << *Sym << "\n"; } else diff --git a/llvm/lib/ExecutionEngine/JITLink/JITLinkMemoryManager.cpp b/llvm/lib/ExecutionEngine/JITLink/JITLinkMemoryManager.cpp --- a/llvm/lib/ExecutionEngine/JITLink/JITLinkMemoryManager.cpp +++ b/llvm/lib/ExecutionEngine/JITLink/JITLinkMemoryManager.cpp @@ -25,7 +25,7 @@ for (auto &Sec : G.sections()) { // Skip empty sections. - if (empty(Sec.blocks())) + if (Sec.blocks().empty()) continue; auto &Seg = Segments[{Sec.getMemProt(), Sec.getMemDeallocPolicy()}]; diff --git a/llvm/lib/ExecutionEngine/Orc/DebuggerSupportPlugin.cpp b/llvm/lib/ExecutionEngine/Orc/DebuggerSupportPlugin.cpp --- a/llvm/lib/ExecutionEngine/Orc/DebuggerSupportPlugin.cpp +++ b/llvm/lib/ExecutionEngine/Orc/DebuggerSupportPlugin.cpp @@ -137,7 +137,7 @@ SmallVector DebugSecInfos; size_t NumSections = 0; for (auto &Sec : G.sections()) { - if (llvm::empty(Sec.blocks())) + if (Sec.blocks().empty()) continue; ++NumSections; @@ -189,7 +189,7 @@ // Copy debug section blocks and symbols. orc::ExecutorAddr NextBlockAddr(MachOContainerBlock->getSize()); for (auto &SI : DebugSecInfos) { - assert(!llvm::empty(SI.Sec->blocks()) && "Empty debug info section?"); + assert(!SI.Sec->blocks().empty() && "Empty debug info section?"); // Update addresses in debug section. LLVM_DEBUG({ diff --git a/llvm/lib/ExecutionEngine/Orc/Layer.cpp b/llvm/lib/ExecutionEngine/Orc/Layer.cpp --- a/llvm/lib/ExecutionEngine/Orc/Layer.cpp +++ b/llvm/lib/ExecutionEngine/Orc/Layer.cpp @@ -81,7 +81,7 @@ } // If we need an init symbol for this module then create one. - if (!llvm::empty(getStaticInitGVs(M))) { + if (!getStaticInitGVs(M).empty()) { size_t Counter = 0; do { diff --git a/llvm/lib/ExecutionEngine/Orc/MachOPlatform.cpp b/llvm/lib/ExecutionEngine/Orc/MachOPlatform.cpp --- a/llvm/lib/ExecutionEngine/Orc/MachOPlatform.cpp +++ b/llvm/lib/ExecutionEngine/Orc/MachOPlatform.cpp @@ -744,7 +744,7 @@ auto ObjCImageInfoBlocks = ObjCImageInfo->blocks(); // Check that the section is not empty if present. - if (llvm::empty(ObjCImageInfoBlocks)) + if (ObjCImageInfoBlocks.empty()) return make_error("Empty " + ObjCImageInfoSectionName + " section in " + G.getName(), inconvertibleErrorCode()); diff --git a/llvm/lib/Target/AMDGPU/AMDGPURegisterBankInfo.cpp b/llvm/lib/Target/AMDGPU/AMDGPURegisterBankInfo.cpp --- a/llvm/lib/Target/AMDGPU/AMDGPURegisterBankInfo.cpp +++ b/llvm/lib/Target/AMDGPU/AMDGPURegisterBankInfo.cpp @@ -2539,7 +2539,7 @@ LLT SrcTy = MRI.getType(SrcReg); const bool Signed = Opc == AMDGPU::G_SEXT; - assert(empty(OpdMapper.getVRegs(1))); + assert(OpdMapper.getVRegs(1).empty()); MachineIRBuilder B(MI); const RegisterBank *SrcBank = diff --git a/llvm/lib/Target/X86/X86FastISel.cpp b/llvm/lib/Target/X86/X86FastISel.cpp --- a/llvm/lib/Target/X86/X86FastISel.cpp +++ b/llvm/lib/Target/X86/X86FastISel.cpp @@ -274,9 +274,7 @@ // Make sure no potentially eflags clobbering phi moves can be inserted in // between. - auto HasPhis = [](const BasicBlock *Succ) { - return !llvm::empty(Succ->phis()); - }; + auto HasPhis = [](const BasicBlock *Succ) { return !Succ->phis().empty(); }; if (I->isTerminator() && llvm::any_of(successors(I), HasPhis)) return false; diff --git a/llvm/lib/Transforms/Utils/LoopUtils.cpp b/llvm/lib/Transforms/Utils/LoopUtils.cpp --- a/llvm/lib/Transforms/Utils/LoopUtils.cpp +++ b/llvm/lib/Transforms/Utils/LoopUtils.cpp @@ -1843,7 +1843,7 @@ if (L.contains(Succ)) continue; - Info.PathIsNoop &= llvm::empty(Succ->phis()) && + Info.PathIsNoop &= Succ->phis().empty() && (!Info.ExitForPath || Info.ExitForPath == Succ); if (!Info.PathIsNoop) break; diff --git a/llvm/tools/llvm-jitlink/llvm-jitlink-coff.cpp b/llvm/tools/llvm-jitlink/llvm-jitlink-coff.cpp --- a/llvm/tools/llvm-jitlink/llvm-jitlink-coff.cpp +++ b/llvm/tools/llvm-jitlink/llvm-jitlink-coff.cpp @@ -80,13 +80,12 @@ for (auto &Sec : G.sections()) { LLVM_DEBUG({ dbgs() << " Section \"" << Sec.getName() << "\": " - << (llvm::empty(Sec.symbols()) ? "empty. skipping." - : "processing...") + << (Sec.symbols().empty() ? "empty. skipping." : "processing...") << "\n"; }); // Skip empty sections. - if (llvm::empty(Sec.symbols())) + if (Sec.symbols().empty()) continue; if (FileInfo.SectionInfos.count(Sec.getName())) diff --git a/llvm/tools/llvm-jitlink/llvm-jitlink-elf.cpp b/llvm/tools/llvm-jitlink/llvm-jitlink-elf.cpp --- a/llvm/tools/llvm-jitlink/llvm-jitlink-elf.cpp +++ b/llvm/tools/llvm-jitlink/llvm-jitlink-elf.cpp @@ -82,13 +82,12 @@ for (auto &Sec : G.sections()) { LLVM_DEBUG({ dbgs() << " Section \"" << Sec.getName() << "\": " - << (llvm::empty(Sec.symbols()) ? "empty. skipping." - : "processing...") + << (Sec.symbols().empty() ? "empty. skipping." : "processing...") << "\n"; }); // Skip empty sections. - if (llvm::empty(Sec.symbols())) + if (Sec.symbols().empty()) continue; if (FileInfo.SectionInfos.count(Sec.getName())) diff --git a/llvm/tools/llvm-jitlink/llvm-jitlink-macho.cpp b/llvm/tools/llvm-jitlink/llvm-jitlink-macho.cpp --- a/llvm/tools/llvm-jitlink/llvm-jitlink-macho.cpp +++ b/llvm/tools/llvm-jitlink/llvm-jitlink-macho.cpp @@ -84,13 +84,12 @@ for (auto &Sec : G.sections()) { LLVM_DEBUG({ dbgs() << " Section \"" << Sec.getName() << "\": " - << (llvm::empty(Sec.symbols()) ? "empty. skipping." - : "processing...") + << (Sec.symbols().empty() ? "empty. skipping." : "processing...") << "\n"; }); // Skip empty sections. - if (llvm::empty(Sec.symbols())) + if (Sec.symbols().empty()) continue; if (FileInfo.SectionInfos.count(Sec.getName())) diff --git a/llvm/tools/llvm-jitlink/llvm-jitlink.cpp b/llvm/tools/llvm-jitlink/llvm-jitlink.cpp --- a/llvm/tools/llvm-jitlink/llvm-jitlink.cpp +++ b/llvm/tools/llvm-jitlink/llvm-jitlink.cpp @@ -403,11 +403,11 @@ Sections.push_back(&S); llvm::sort(Sections, [](const Section *LHS, const Section *RHS) { - if (llvm::empty(LHS->symbols()) && llvm::empty(RHS->symbols())) + if (LHS->symbols().empty() && RHS->symbols().empty()) return false; - if (llvm::empty(LHS->symbols())) + if (LHS->symbols().empty()) return false; - if (llvm::empty(RHS->symbols())) + if (RHS->symbols().empty()) return true; SectionRange LHSRange(*LHS); SectionRange RHSRange(*RHS); @@ -416,7 +416,7 @@ for (auto *S : Sections) { OS << S->getName() << " content:"; - if (llvm::empty(S->symbols())) { + if (S->symbols().empty()) { OS << "\n section empty\n"; continue; }