Skip to content

Commit c6c3946

Browse files
[clang] Use *Set::insert_range (NFC) (#132507)
DenseSet, SmallPtrSet, SmallSet, SetVector, and StringSet recently gained C++23-style insert_range. This patch replaces: Dest.insert(Src.begin(), Src.end()); with: Dest.insert_range(Src); This patch does not touch custom begin like succ_begin for now.
1 parent c5d4dfb commit c6c3946

File tree

13 files changed

+15
-17
lines changed

13 files changed

+15
-17
lines changed

clang/include/clang/StaticAnalyzer/Core/PathSensitive/ExplodedGraph.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ class ExplodedNodeSet {
485485
if (empty())
486486
Impl = S.Impl;
487487
else
488-
Impl.insert(S.begin(), S.end());
488+
Impl.insert_range(S);
489489
}
490490

491491
iterator begin() { return Impl.begin(); }

clang/lib/AST/RecordLayoutBuilder.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3304,7 +3304,7 @@ void MicrosoftRecordLayoutBuilder::computeVtorDispSet(
33043304
if (MethodRange.begin() == MethodRange.end())
33053305
BasesWithOverriddenMethods.insert(MD->getParent());
33063306
else
3307-
Work.insert(MethodRange.begin(), MethodRange.end());
3307+
Work.insert_range(MethodRange);
33083308
// We've finished processing this element, remove it from the working set.
33093309
Work.erase(MD);
33103310
}

clang/lib/Analysis/UnsafeBufferUsage.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4298,7 +4298,7 @@ static void applyGadgets(const Decl *D, FixableGadgetList FixableGadgets,
42984298
HasParm = true;
42994299
}
43004300
if (HasParm)
4301-
GrpsUnionForParms.insert(VarGroup.begin(), VarGroup.end());
4301+
GrpsUnionForParms.insert_range(VarGroup);
43024302
}
43034303
}
43044304

clang/lib/Driver/Multilib.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ MultilibSet::expandFlags(const Multilib::flags_list &InFlags) const {
288288
assert(Regex.isValid());
289289
if (llvm::any_of(InFlags,
290290
[&Regex](StringRef F) { return Regex.match(F); })) {
291-
Result.insert(M.Flags.begin(), M.Flags.end());
291+
Result.insert_range(M.Flags);
292292
}
293293
}
294294
return Result;

clang/lib/Sema/SemaAttr.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1267,7 +1267,7 @@ void Sema::ActOnPragmaMSFunction(
12671267
return;
12681268
}
12691269

1270-
MSFunctionNoBuiltins.insert(NoBuiltins.begin(), NoBuiltins.end());
1270+
MSFunctionNoBuiltins.insert_range(NoBuiltins);
12711271
}
12721272

12731273
void Sema::AddRangeBasedOptnone(FunctionDecl *FD) {

clang/lib/Sema/SemaDeclCXX.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18920,7 +18920,7 @@ void DelegatingCycleHelper(CXXConstructorDecl* Ctor,
1892018920
// We know that beyond here, we aren't chaining into a cycle.
1892118921
if (!Target || !Target->isDelegatingConstructor() ||
1892218922
Target->isInvalidDecl() || Valid.count(TCanonical)) {
18923-
Valid.insert(Current.begin(), Current.end());
18923+
Valid.insert_range(Current);
1892418924
Current.clear();
1892518925
// We've hit a cycle.
1892618926
} else if (TCanonical == Canonical || Invalid.count(TCanonical) ||
@@ -18947,7 +18947,7 @@ void DelegatingCycleHelper(CXXConstructorDecl* Ctor,
1894718947
}
1894818948
}
1894918949

18950-
Invalid.insert(Current.begin(), Current.end());
18950+
Invalid.insert_range(Current);
1895118951
Current.clear();
1895218952
} else {
1895318953
DelegatingCycleHelper(Target, Valid, Invalid, Current, S);

clang/lib/Sema/SemaExpr.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17944,8 +17944,7 @@ void Sema::PopExpressionEvaluationContext() {
1794417944
// Otherwise, merge the contexts together.
1794517945
} else {
1794617946
Cleanup.mergeFrom(Rec.ParentCleanup);
17947-
MaybeODRUseExprs.insert(Rec.SavedMaybeODRUseExprs.begin(),
17948-
Rec.SavedMaybeODRUseExprs.end());
17947+
MaybeODRUseExprs.insert_range(Rec.SavedMaybeODRUseExprs);
1794917948
}
1795017949

1795117950
// Pop the current expression evaluation context off the stack.

clang/lib/Serialization/ASTReaderInternals.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class ASTDeclContextNameLookupTraitBase {
6969
}
7070

7171
// Switch to tracking found IDs in the set.
72-
Found.insert(Data.begin(), Data.end());
72+
Found.insert_range(Data);
7373
}
7474

7575
if (Found.insert(ID).second)
@@ -191,7 +191,7 @@ class LazySpecializationInfoLookupTrait {
191191
}
192192

193193
// Switch to tracking found IDs in the set.
194-
Found.insert(Data.begin(), Data.end());
194+
Found.insert_range(Data);
195195
}
196196

197197
if (Found.insert(Info).second)

clang/lib/Serialization/MultiOnDiskHashTable.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ template<typename Info> class MultiOnDiskHashTable {
127127

128128
void removeOverriddenTables() {
129129
llvm::DenseSet<file_type> Files;
130-
Files.insert(PendingOverrides.begin(), PendingOverrides.end());
130+
Files.insert_range(PendingOverrides);
131131
// Explicitly capture Files to work around an MSVC 2015 rejects-valid bug.
132132
auto ShouldRemove = [&Files](void *T) -> bool {
133133
auto *ODT = llvm::cast<OnDiskTable *>(Table::getFromOpaqueValue(T));

clang/lib/StaticAnalyzer/Frontend/CheckerRegistry.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ void CheckerRegistry::initializeRegistry(const CheckerManager &Mgr) {
223223
continue;
224224
}
225225

226-
Tmp.insert(Deps.begin(), Deps.end());
226+
Tmp.insert_range(Deps);
227227

228228
// Enable the checker.
229229
Tmp.insert(&Checker);

clang/tools/libclang/Indexing.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ class ThreadSafeParsedRegions {
137137

138138
void addParsedRegions(ArrayRef<PPRegion> Regions) {
139139
std::lock_guard<std::mutex> MG(Mutex);
140-
ParsedRegions.insert(Regions.begin(), Regions.end());
140+
ParsedRegions.insert_range(Regions);
141141
}
142142
};
143143

clang/unittests/Analysis/FlowSensitive/TypeErasedDataflowAnalysisTest.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -493,8 +493,7 @@ struct FunctionCallLattice {
493493
if (Other.CalledFunctions.empty())
494494
return LatticeJoinEffect::Unchanged;
495495
const size_t size_before = CalledFunctions.size();
496-
CalledFunctions.insert(Other.CalledFunctions.begin(),
497-
Other.CalledFunctions.end());
496+
CalledFunctions.insert_range(Other.CalledFunctions);
498497
return CalledFunctions.size() == size_before ? LatticeJoinEffect::Unchanged
499498
: LatticeJoinEffect::Changed;
500499
}

clang/utils/TableGen/NeonEmitter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1661,7 +1661,7 @@ Intrinsic::DagEmitter::emitDagShuffle(const DagInit *DI) {
16611661
}
16621662
}
16631663

1664-
Elts.insert(Revved.begin(), Revved.end());
1664+
Elts.insert_range(Revved);
16651665
}
16661666
};
16671667

0 commit comments

Comments
 (0)