Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,7 @@ class DWARFAbbreviationDeclaration {
using attr_iterator_range =
iterator_range<AttributeSpecVector::const_iterator>;

attr_iterator_range attributes() const {
return attr_iterator_range(AttributeSpecs.begin(), AttributeSpecs.end());
}
attr_iterator_range attributes() const { return AttributeSpecs; }

dwarf::Form getFormByIndex(uint32_t idx) const {
assert(idx < AttributeSpecs.size());
Expand Down
4 changes: 1 addition & 3 deletions llvm/include/llvm/DebugInfo/DWARF/DWARFDebugFrame.h
Original file line number Diff line number Diff line change
Expand Up @@ -226,9 +226,7 @@ class DWARFDebugFrame {
/// DWARF Frame entries accessors
iterator begin() const { return Entries.begin(); }
iterator end() const { return Entries.end(); }
iterator_range<iterator> entries() const {
return iterator_range<iterator>(Entries.begin(), Entries.end());
}
iterator_range<iterator> entries() const { return Entries; }

uint64_t getEHFrameAddress() const { return EHFrameAddress; }
};
Expand Down
2 changes: 1 addition & 1 deletion llvm/include/llvm/DebugInfo/DWARF/DWARFUnit.h
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,7 @@ class LLVM_ABI DWARFUnit {

die_iterator_range dies() {
extractDIEsIfNeeded(false);
return die_iterator_range(DieArray.begin(), DieArray.end());
return DieArray;
}

virtual void dump(raw_ostream &OS, DIDumpOptions DumpOpts) = 0;
Expand Down
18 changes: 5 additions & 13 deletions llvm/include/llvm/IR/DebugInfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -140,25 +140,17 @@ class DebugInfoFinder {
using type_iterator = SmallVectorImpl<DIType *>::const_iterator;
using scope_iterator = SmallVectorImpl<DIScope *>::const_iterator;

iterator_range<compile_unit_iterator> compile_units() const {
return make_range(CUs.begin(), CUs.end());
}
iterator_range<compile_unit_iterator> compile_units() const { return CUs; }

iterator_range<subprogram_iterator> subprograms() const {
return make_range(SPs.begin(), SPs.end());
}
iterator_range<subprogram_iterator> subprograms() const { return SPs; }

iterator_range<global_variable_expression_iterator> global_variables() const {
return make_range(GVs.begin(), GVs.end());
return GVs;
}

iterator_range<type_iterator> types() const {
return make_range(TYs.begin(), TYs.end());
}
iterator_range<type_iterator> types() const { return TYs; }

iterator_range<scope_iterator> scopes() const {
return make_range(Scopes.begin(), Scopes.end());
}
iterator_range<scope_iterator> scopes() const { return Scopes; }

unsigned compile_unit_count() const { return CUs.size(); }
unsigned global_variable_count() const { return GVs.size(); }
Expand Down
4 changes: 2 additions & 2 deletions llvm/include/llvm/Object/DXContainer.h
Original file line number Diff line number Diff line change
Expand Up @@ -245,10 +245,10 @@ class RootSignature {
uint32_t getStaticSamplersOffset() const { return StaticSamplersOffset; }
uint32_t getNumRootParameters() const { return ParametersHeaders.size(); }
llvm::iterator_range<param_header_iterator> param_headers() const {
return llvm::make_range(ParametersHeaders.begin(), ParametersHeaders.end());
return ParametersHeaders;
}
llvm::iterator_range<samplers_iterator> samplers() const {
return llvm::make_range(StaticSamplers.begin(), StaticSamplers.end());
return StaticSamplers;
}
uint32_t getFlags() const { return Flags; }

Expand Down
4 changes: 1 addition & 3 deletions llvm/include/llvm/Object/MachO.h
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,7 @@ class ExportEntry {
NodeList Stack;
bool Done = false;

iterator_range<node_iterator> nodes() const {
return make_range(Stack.begin(), Stack.end());
}
iterator_range<node_iterator> nodes() const { return Stack; }
};
using export_iterator = content_iterator<ExportEntry>;

Expand Down
4 changes: 1 addition & 3 deletions llvm/include/llvm/Remarks/RemarkLinker.h
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,7 @@ struct RemarkLinker {
/// for (const Remark &R : RL.remarks() { [...] }
using iterator = pointee_iterator<decltype(Remarks)::const_iterator>;

iterator_range<iterator> remarks() const {
return {Remarks.begin(), Remarks.end()};
}
iterator_range<iterator> remarks() const { return Remarks; }
};

/// Returns a buffer with the contents of the remarks section depending on the
Expand Down
16 changes: 4 additions & 12 deletions llvm/include/llvm/TextAPI/SymbolSet.h
Original file line number Diff line number Diff line change
Expand Up @@ -139,38 +139,30 @@ class SymbolSet {
iterator_range<const_filtered_symbol_iterator>;

// Range that contains all symbols.
const_symbol_range symbols() const {
return {Symbols.begin(), Symbols.end()};
}
const_symbol_range symbols() const { return Symbols; }

// Range that contains all defined and exported symbols.
const_filtered_symbol_range exports() const {
std::function<bool(const Symbol *)> fn = [](const Symbol *Symbol) {
return !Symbol->isUndefined() && !Symbol->isReexported();
};
return make_filter_range(
make_range<const_symbol_iterator>({Symbols.begin()}, {Symbols.end()}),
fn);
return make_filter_range(symbols(), fn);
}

// Range that contains all reexported symbols.
const_filtered_symbol_range reexports() const {
std::function<bool(const Symbol *)> fn = [](const Symbol *Symbol) {
return Symbol->isReexported();
};
return make_filter_range(
make_range<const_symbol_iterator>({Symbols.begin()}, {Symbols.end()}),
fn);
return make_filter_range(symbols(), fn);
}

// Range that contains all undefined and exported symbols.
const_filtered_symbol_range undefineds() const {
std::function<bool(const Symbol *)> fn = [](const Symbol *Symbol) {
return Symbol->isUndefined();
};
return make_filter_range(
make_range<const_symbol_iterator>({Symbols.begin()}, {Symbols.end()}),
fn);
return make_filter_range(symbols(), fn);
}

LLVM_ABI bool operator==(const SymbolSet &O) const;
Expand Down
4 changes: 2 additions & 2 deletions llvm/lib/IR/DebugProgramInstruction.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -665,11 +665,11 @@ void DbgMarker::eraseFromParent() {
}

iterator_range<DbgRecord::self_iterator> DbgMarker::getDbgRecordRange() {
return make_range(StoredDbgRecords.begin(), StoredDbgRecords.end());
return StoredDbgRecords;
}
iterator_range<DbgRecord::const_self_iterator>
DbgMarker::getDbgRecordRange() const {
return make_range(StoredDbgRecords.begin(), StoredDbgRecords.end());
return StoredDbgRecords;
}

void DbgRecord::removeFromParent() {
Expand Down
4 changes: 1 addition & 3 deletions llvm/lib/Target/ARM/ARMConstantPoolValue.h
Original file line number Diff line number Diff line change
Expand Up @@ -176,9 +176,7 @@ class ARMConstantPoolConstant : public ARMConstantPoolValue {

using promoted_iterator = SmallPtrSet<const GlobalVariable *, 1>::iterator;

iterator_range<promoted_iterator> promotedGlobals() {
return iterator_range<promoted_iterator>(GVars.begin(), GVars.end());
}
iterator_range<promoted_iterator> promotedGlobals() { return GVars; }

const Constant *getPromotedGlobalInit() const {
return CVal;
Expand Down
4 changes: 1 addition & 3 deletions llvm/lib/Target/X86/X86DomainReassignment.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -324,9 +324,7 @@ class Closure {
bool insertEdge(Register Reg) { return Edges.insert(Reg).second; }

using const_edge_iterator = DenseSet<Register>::const_iterator;
iterator_range<const_edge_iterator> edges() const {
return iterator_range<const_edge_iterator>(Edges.begin(), Edges.end());
}
iterator_range<const_edge_iterator> edges() const { return Edges; }

void addInstruction(MachineInstr *I) {
Instrs.push_back(I);
Expand Down
6 changes: 2 additions & 4 deletions llvm/utils/TableGen/Common/GlobalISel/GlobalISelMatchTable.h
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ class GroupMatcher final : public Matcher {
/// has been already called. If any of the matchers are moved out, the group
/// becomes safe to destroy, but not safe to re-use for anything else.
iterator_range<std::vector<Matcher *>::iterator> matchers() {
return make_range(Matchers.begin(), Matchers.end());
return Matchers;
}
size_t size() const { return Matchers.size(); }
bool empty() const { return Matchers.empty(); }
Expand Down Expand Up @@ -704,9 +704,7 @@ class RuleMatcher : public Matcher {
return make_range(PhysRegOperands.begin(), PhysRegOperands.end());
}

iterator_range<MatchersTy::iterator> insnmatchers() {
return make_range(Matchers.begin(), Matchers.end());
}
iterator_range<MatchersTy::iterator> insnmatchers() { return Matchers; }
bool insnmatchers_empty() const { return Matchers.empty(); }
void insnmatchers_pop_front();
};
Expand Down
2 changes: 1 addition & 1 deletion llvm/utils/TableGen/RegisterBankEmitter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ class RegisterBank {

iterator_range<typename RegisterClassesTy::const_iterator>
register_classes() const {
return llvm::make_range(RCs.begin(), RCs.end());
return RCs;
}
};

Expand Down