Skip to content

Commit 378d5ea

Browse files
[llvm] Use iterator_range<T>(Container &&) (NFC) (#165117)
This patch simplifies construction of iterator_range<T> by using: iterator_range<T>(Container &&) instead of: iterator_range<T>(T begin_iterator, T end_iterator)
1 parent 5d23610 commit 378d5ea

File tree

13 files changed

+23
-53
lines changed

13 files changed

+23
-53
lines changed

llvm/include/llvm/DebugInfo/DWARF/DWARFAbbreviationDeclaration.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,7 @@ class DWARFAbbreviationDeclaration {
102102
using attr_iterator_range =
103103
iterator_range<AttributeSpecVector::const_iterator>;
104104

105-
attr_iterator_range attributes() const {
106-
return attr_iterator_range(AttributeSpecs.begin(), AttributeSpecs.end());
107-
}
105+
attr_iterator_range attributes() const { return AttributeSpecs; }
108106

109107
dwarf::Form getFormByIndex(uint32_t idx) const {
110108
assert(idx < AttributeSpecs.size());

llvm/include/llvm/DebugInfo/DWARF/DWARFDebugFrame.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -226,9 +226,7 @@ class DWARFDebugFrame {
226226
/// DWARF Frame entries accessors
227227
iterator begin() const { return Entries.begin(); }
228228
iterator end() const { return Entries.end(); }
229-
iterator_range<iterator> entries() const {
230-
return iterator_range<iterator>(Entries.begin(), Entries.end());
231-
}
229+
iterator_range<iterator> entries() const { return Entries; }
232230

233231
uint64_t getEHFrameAddress() const { return EHFrameAddress; }
234232
};

llvm/include/llvm/DebugInfo/DWARF/DWARFUnit.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,7 @@ class LLVM_ABI DWARFUnit {
563563

564564
die_iterator_range dies() {
565565
extractDIEsIfNeeded(false);
566-
return die_iterator_range(DieArray.begin(), DieArray.end());
566+
return DieArray;
567567
}
568568

569569
virtual void dump(raw_ostream &OS, DIDumpOptions DumpOpts) = 0;

llvm/include/llvm/IR/DebugInfo.h

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -140,25 +140,17 @@ class DebugInfoFinder {
140140
using type_iterator = SmallVectorImpl<DIType *>::const_iterator;
141141
using scope_iterator = SmallVectorImpl<DIScope *>::const_iterator;
142142

143-
iterator_range<compile_unit_iterator> compile_units() const {
144-
return make_range(CUs.begin(), CUs.end());
145-
}
143+
iterator_range<compile_unit_iterator> compile_units() const { return CUs; }
146144

147-
iterator_range<subprogram_iterator> subprograms() const {
148-
return make_range(SPs.begin(), SPs.end());
149-
}
145+
iterator_range<subprogram_iterator> subprograms() const { return SPs; }
150146

151147
iterator_range<global_variable_expression_iterator> global_variables() const {
152-
return make_range(GVs.begin(), GVs.end());
148+
return GVs;
153149
}
154150

155-
iterator_range<type_iterator> types() const {
156-
return make_range(TYs.begin(), TYs.end());
157-
}
151+
iterator_range<type_iterator> types() const { return TYs; }
158152

159-
iterator_range<scope_iterator> scopes() const {
160-
return make_range(Scopes.begin(), Scopes.end());
161-
}
153+
iterator_range<scope_iterator> scopes() const { return Scopes; }
162154

163155
unsigned compile_unit_count() const { return CUs.size(); }
164156
unsigned global_variable_count() const { return GVs.size(); }

llvm/include/llvm/Object/DXContainer.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,10 +245,10 @@ class RootSignature {
245245
uint32_t getStaticSamplersOffset() const { return StaticSamplersOffset; }
246246
uint32_t getNumRootParameters() const { return ParametersHeaders.size(); }
247247
llvm::iterator_range<param_header_iterator> param_headers() const {
248-
return llvm::make_range(ParametersHeaders.begin(), ParametersHeaders.end());
248+
return ParametersHeaders;
249249
}
250250
llvm::iterator_range<samplers_iterator> samplers() const {
251-
return llvm::make_range(StaticSamplers.begin(), StaticSamplers.end());
251+
return StaticSamplers;
252252
}
253253
uint32_t getFlags() const { return Flags; }
254254

llvm/include/llvm/Object/MachO.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,7 @@ class ExportEntry {
121121
NodeList Stack;
122122
bool Done = false;
123123

124-
iterator_range<node_iterator> nodes() const {
125-
return make_range(Stack.begin(), Stack.end());
126-
}
124+
iterator_range<node_iterator> nodes() const { return Stack; }
127125
};
128126
using export_iterator = content_iterator<ExportEntry>;
129127

llvm/include/llvm/Remarks/RemarkLinker.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,7 @@ struct RemarkLinker {
101101
/// for (const Remark &R : RL.remarks() { [...] }
102102
using iterator = pointee_iterator<decltype(Remarks)::const_iterator>;
103103

104-
iterator_range<iterator> remarks() const {
105-
return {Remarks.begin(), Remarks.end()};
106-
}
104+
iterator_range<iterator> remarks() const { return Remarks; }
107105
};
108106

109107
/// Returns a buffer with the contents of the remarks section depending on the

llvm/include/llvm/TextAPI/SymbolSet.h

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -139,38 +139,30 @@ class SymbolSet {
139139
iterator_range<const_filtered_symbol_iterator>;
140140

141141
// Range that contains all symbols.
142-
const_symbol_range symbols() const {
143-
return {Symbols.begin(), Symbols.end()};
144-
}
142+
const_symbol_range symbols() const { return Symbols; }
145143

146144
// Range that contains all defined and exported symbols.
147145
const_filtered_symbol_range exports() const {
148146
std::function<bool(const Symbol *)> fn = [](const Symbol *Symbol) {
149147
return !Symbol->isUndefined() && !Symbol->isReexported();
150148
};
151-
return make_filter_range(
152-
make_range<const_symbol_iterator>({Symbols.begin()}, {Symbols.end()}),
153-
fn);
149+
return make_filter_range(symbols(), fn);
154150
}
155151

156152
// Range that contains all reexported symbols.
157153
const_filtered_symbol_range reexports() const {
158154
std::function<bool(const Symbol *)> fn = [](const Symbol *Symbol) {
159155
return Symbol->isReexported();
160156
};
161-
return make_filter_range(
162-
make_range<const_symbol_iterator>({Symbols.begin()}, {Symbols.end()}),
163-
fn);
157+
return make_filter_range(symbols(), fn);
164158
}
165159

166160
// Range that contains all undefined and exported symbols.
167161
const_filtered_symbol_range undefineds() const {
168162
std::function<bool(const Symbol *)> fn = [](const Symbol *Symbol) {
169163
return Symbol->isUndefined();
170164
};
171-
return make_filter_range(
172-
make_range<const_symbol_iterator>({Symbols.begin()}, {Symbols.end()}),
173-
fn);
165+
return make_filter_range(symbols(), fn);
174166
}
175167

176168
LLVM_ABI bool operator==(const SymbolSet &O) const;

llvm/lib/IR/DebugProgramInstruction.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -665,11 +665,11 @@ void DbgMarker::eraseFromParent() {
665665
}
666666

667667
iterator_range<DbgRecord::self_iterator> DbgMarker::getDbgRecordRange() {
668-
return make_range(StoredDbgRecords.begin(), StoredDbgRecords.end());
668+
return StoredDbgRecords;
669669
}
670670
iterator_range<DbgRecord::const_self_iterator>
671671
DbgMarker::getDbgRecordRange() const {
672-
return make_range(StoredDbgRecords.begin(), StoredDbgRecords.end());
672+
return StoredDbgRecords;
673673
}
674674

675675
void DbgRecord::removeFromParent() {

llvm/lib/Target/ARM/ARMConstantPoolValue.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,9 +176,7 @@ class ARMConstantPoolConstant : public ARMConstantPoolValue {
176176

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

179-
iterator_range<promoted_iterator> promotedGlobals() {
180-
return iterator_range<promoted_iterator>(GVars.begin(), GVars.end());
181-
}
179+
iterator_range<promoted_iterator> promotedGlobals() { return GVars; }
182180

183181
const Constant *getPromotedGlobalInit() const {
184182
return CVal;

0 commit comments

Comments
 (0)