Skip to content
This repository was archived by the owner on Nov 1, 2021. It is now read-only.

Commit 09d19ef

Browse files
topperctopperc
committed
Use SmallVectorImpl instead of SmallVector for iterators and references to avoid specifying the vector size unnecessarily.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@185610 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent 8b625a3 commit 09d19ef

30 files changed

+75
-75
lines changed

‎include/clang/AST/CXXInheritance.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -287,9 +287,9 @@ class OverridingMethods {
287287

288288
// Iterate over the set of overriding virtual methods in a given
289289
// subobject.
290-
typedef SmallVector<UniqueVirtualMethod, 4>::iterator
290+
typedef SmallVectorImpl<UniqueVirtualMethod>::iterator
291291
overriding_iterator;
292-
typedef SmallVector<UniqueVirtualMethod, 4>::const_iterator
292+
typedef SmallVectorImpl<UniqueVirtualMethod>::const_iterator
293293
overriding_const_iterator;
294294

295295
// Add a new overriding method for a particular subobject.

‎include/clang/Analysis/CallGraph.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@ class CallGraphNode {
144144
public:
145145
CallGraphNode(Decl *D) : FD(D) {}
146146

147-
typedef SmallVector<CallRecord, 5>::iterator iterator;
148-
typedef SmallVector<CallRecord, 5>::const_iterator const_iterator;
147+
typedef SmallVectorImpl<CallRecord>::iterator iterator;
148+
typedef SmallVectorImpl<CallRecord>::const_iterator const_iterator;
149149

150150
/// Iterators through all the callees/children of the node.
151151
inline iterator begin() { return CalledFunctions.begin(); }

‎include/clang/Edit/Commit.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ class Commit {
103103
CharSourceRange::getTokenRange(TokenInnerRange));
104104
}
105105

106-
typedef SmallVector<Edit, 8>::const_iterator edit_iterator;
106+
typedef SmallVectorImpl<Edit>::const_iterator edit_iterator;
107107
edit_iterator edit_begin() const { return CachedEdits.begin(); }
108108
edit_iterator edit_end() const { return CachedEdits.end(); }
109109

‎include/clang/Lex/MacroInfo.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ class MacroInfo {
251251
return ReplacementTokens[Tok];
252252
}
253253

254-
typedef SmallVector<Token, 8>::const_iterator tokens_iterator;
254+
typedef SmallVectorImpl<Token>::const_iterator tokens_iterator;
255255
tokens_iterator tokens_begin() const { return ReplacementTokens.begin(); }
256256
tokens_iterator tokens_end() const { return ReplacementTokens.end(); }
257257
bool tokens_empty() const { return ReplacementTokens.empty(); }

‎include/clang/Sema/Overload.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -773,7 +773,7 @@ namespace clang {
773773
/// \brief Clear out all of the candidates.
774774
void clear();
775775

776-
typedef SmallVector<OverloadCandidate, 16>::iterator iterator;
776+
typedef SmallVectorImpl<OverloadCandidate>::iterator iterator;
777777
iterator begin() { return Candidates.begin(); }
778778
iterator end() { return Candidates.end(); }
779779

‎include/clang/Sema/TypoCorrection.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -195,12 +195,12 @@ class TypoCorrection {
195195
return CorrectionRange;
196196
}
197197

198-
typedef SmallVector<NamedDecl *, 1>::iterator decl_iterator;
198+
typedef SmallVectorImpl<NamedDecl *>::iterator decl_iterator;
199199
decl_iterator begin() {
200200
return isKeyword() ? CorrectionDecls.end() : CorrectionDecls.begin();
201201
}
202202
decl_iterator end() { return CorrectionDecls.end(); }
203-
typedef SmallVector<NamedDecl *, 1>::const_iterator const_decl_iterator;
203+
typedef SmallVectorImpl<NamedDecl *>::const_iterator const_decl_iterator;
204204
const_decl_iterator begin() const {
205205
return isKeyword() ? CorrectionDecls.end() : CorrectionDecls.begin();
206206
}

‎include/clang/Serialization/ModuleManager.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@ class ModuleManager {
9696
void returnVisitState(VisitState *State);
9797

9898
public:
99-
typedef SmallVector<ModuleFile*, 2>::iterator ModuleIterator;
100-
typedef SmallVector<ModuleFile*, 2>::const_iterator ModuleConstIterator;
101-
typedef SmallVector<ModuleFile*, 2>::reverse_iterator ModuleReverseIterator;
99+
typedef SmallVectorImpl<ModuleFile*>::iterator ModuleIterator;
100+
typedef SmallVectorImpl<ModuleFile*>::const_iterator ModuleConstIterator;
101+
typedef SmallVectorImpl<ModuleFile*>::reverse_iterator ModuleReverseIterator;
102102
typedef std::pair<uint32_t, StringRef> ModuleOffset;
103103

104104
explicit ModuleManager(FileManager &FileMgr);

‎lib/AST/ASTDumper.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -335,8 +335,8 @@ void ASTDumper::indent() {
335335
OS << "\n";
336336

337337
ColorScope Color(*this, IndentColor);
338-
for (llvm::SmallVector<IndentType, 32>::const_iterator I = Indents.begin(),
339-
E = Indents.end();
338+
for (SmallVectorImpl<IndentType>::const_iterator I = Indents.begin(),
339+
E = Indents.end();
340340
I != E; ++I) {
341341
switch (*I) {
342342
case IT_Child:

‎lib/AST/ASTImporter.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -4410,7 +4410,7 @@ Decl *ASTImporter::Import(Decl *FromD) {
44104410
} else if (TypedefNameDecl *FromTypedef = dyn_cast<TypedefNameDecl>(FromD)) {
44114411
// When we've finished transforming a typedef, see whether it was the
44124412
// typedef for an anonymous tag.
4413-
for (SmallVector<TagDecl *, 4>::iterator
4413+
for (SmallVectorImpl<TagDecl *>::iterator
44144414
FromTag = AnonTagsWithPendingTypedefs.begin(),
44154415
FromTagEnd = AnonTagsWithPendingTypedefs.end();
44164416
FromTag != FromTagEnd; ++FromTag) {

‎lib/AST/CXXInheritance.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ FindNestedNameSpecifierMember(const CXXBaseSpecifier *Specifier,
447447

448448
void OverridingMethods::add(unsigned OverriddenSubobject,
449449
UniqueVirtualMethod Overriding) {
450-
SmallVector<UniqueVirtualMethod, 4> &SubobjectOverrides
450+
SmallVectorImpl<UniqueVirtualMethod> &SubobjectOverrides
451451
= Overrides[OverriddenSubobject];
452452
if (std::find(SubobjectOverrides.begin(), SubobjectOverrides.end(),
453453
Overriding) == SubobjectOverrides.end())
@@ -650,11 +650,11 @@ CXXRecordDecl::getFinalOverriders(CXXFinalOverriderMap &FinalOverriders) const {
650650
SOEnd = OM->second.end();
651651
SO != SOEnd;
652652
++SO) {
653-
SmallVector<UniqueVirtualMethod, 4> &Overriding = SO->second;
653+
SmallVectorImpl<UniqueVirtualMethod> &Overriding = SO->second;
654654
if (Overriding.size() < 2)
655655
continue;
656656

657-
for (SmallVector<UniqueVirtualMethod, 4>::iterator
657+
for (SmallVectorImpl<UniqueVirtualMethod>::iterator
658658
Pos = Overriding.begin(), PosEnd = Overriding.end();
659659
Pos != PosEnd;
660660
/* increment in loop */) {
@@ -669,7 +669,7 @@ CXXRecordDecl::getFinalOverriders(CXXFinalOverriderMap &FinalOverriders) const {
669669
// in a base class subobject that hides the virtual base class
670670
// subobject.
671671
bool Hidden = false;
672-
for (SmallVector<UniqueVirtualMethod, 4>::iterator
672+
for (SmallVectorImpl<UniqueVirtualMethod>::iterator
673673
OP = Overriding.begin(), OPEnd = Overriding.end();
674674
OP != OPEnd && !Hidden;
675675
++OP) {

‎lib/Basic/FileManager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,7 @@ void FileManager::GetUniqueIDMapping(
610610
UIDToFiles[FE->getValue()->getUID()] = FE->getValue();
611611

612612
// Map virtual file entries
613-
for (SmallVector<FileEntry*, 4>::const_iterator
613+
for (SmallVectorImpl<FileEntry *>::const_iterator
614614
VFE = VirtualFileEntries.begin(), VFEEnd = VirtualFileEntries.end();
615615
VFE != VFEEnd; ++VFE)
616616
if (*VFE && *VFE != NON_EXISTENT_FILE)

‎lib/Driver/Driver.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1077,7 +1077,7 @@ void Driver::BuildActions(const ToolChain &TC, const DerivedArgList &Args,
10771077

10781078
// Build the pipeline for this file.
10791079
OwningPtr<Action> Current(new InputAction(*InputArg, InputType));
1080-
for (llvm::SmallVector<phases::ID, phases::MaxNumberOfPhases>::iterator
1080+
for (SmallVectorImpl<phases::ID>::iterator
10811081
i = PL.begin(), e = PL.end(); i != e; ++i) {
10821082
phases::ID Phase = *i;
10831083

‎lib/Parse/ParseAST.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ void clang::ParseAST(Sema &S, bool PrintStats, bool SkipFunctionBodies) {
145145
}
146146

147147
// Process any TopLevelDecls generated by #pragma weak.
148-
for (SmallVector<Decl*,2>::iterator
148+
for (SmallVectorImpl<Decl *>::iterator
149149
I = S.WeakTopLevelDecls().begin(),
150150
E = S.WeakTopLevelDecls().end(); I != E; ++I)
151151
Consumer->HandleTopLevelDecl(DeclGroupRef(*I));

‎lib/Parse/ParseDeclCXX.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2243,7 +2243,7 @@ void Parser::ParseCXXClassMemberDeclaration(AccessSpecifier AS,
22432243
SmallVector<SourceRange, 4> Ranges;
22442244
DeclaratorInfo.getCXX11AttributeRanges(Ranges);
22452245
if (!Ranges.empty()) {
2246-
for (SmallVector<SourceRange, 4>::iterator I = Ranges.begin(),
2246+
for (SmallVectorImpl<SourceRange>::iterator I = Ranges.begin(),
22472247
E = Ranges.end(); I != E; ++I) {
22482248
Diag((*I).getBegin(), diag::err_attributes_not_allowed)
22492249
<< *I;

‎lib/Rewrite/Frontend/RewriteModernObjC.cpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -4262,7 +4262,7 @@ std::string RewriteModernObjC::SynthesizeBlockFunc(BlockExpr *CE, int i,
42624262

42634263
// Create local declarations to avoid rewriting all closure decl ref exprs.
42644264
// First, emit a declaration for all "by ref" decls.
4265-
for (SmallVector<ValueDecl*,8>::iterator I = BlockByRefDecls.begin(),
4265+
for (SmallVectorImpl<ValueDecl *>::iterator I = BlockByRefDecls.begin(),
42664266
E = BlockByRefDecls.end(); I != E; ++I) {
42674267
S += " ";
42684268
std::string Name = (*I)->getNameAsString();
@@ -4273,7 +4273,7 @@ std::string RewriteModernObjC::SynthesizeBlockFunc(BlockExpr *CE, int i,
42734273
S += Name + " = __cself->" + (*I)->getNameAsString() + "; // bound by ref\n";
42744274
}
42754275
// Next, emit a declaration for all "by copy" declarations.
4276-
for (SmallVector<ValueDecl*,8>::iterator I = BlockByCopyDecls.begin(),
4276+
for (SmallVectorImpl<ValueDecl *>::iterator I = BlockByCopyDecls.begin(),
42774277
E = BlockByCopyDecls.end(); I != E; ++I) {
42784278
S += " ";
42794279
// Handle nested closure invocation. For example:
@@ -4374,7 +4374,7 @@ std::string RewriteModernObjC::SynthesizeBlockImpl(BlockExpr *CE, std::string Ta
43744374

43754375
if (BlockDeclRefs.size()) {
43764376
// Output all "by copy" declarations.
4377-
for (SmallVector<ValueDecl*,8>::iterator I = BlockByCopyDecls.begin(),
4377+
for (SmallVectorImpl<ValueDecl *>::iterator I = BlockByCopyDecls.begin(),
43784378
E = BlockByCopyDecls.end(); I != E; ++I) {
43794379
S += " ";
43804380
std::string FieldName = (*I)->getNameAsString();
@@ -4403,7 +4403,7 @@ std::string RewriteModernObjC::SynthesizeBlockImpl(BlockExpr *CE, std::string Ta
44034403
S += FieldName + ";\n";
44044404
}
44054405
// Output all "by ref" declarations.
4406-
for (SmallVector<ValueDecl*,8>::iterator I = BlockByRefDecls.begin(),
4406+
for (SmallVectorImpl<ValueDecl *>::iterator I = BlockByRefDecls.begin(),
44074407
E = BlockByRefDecls.end(); I != E; ++I) {
44084408
S += " ";
44094409
std::string FieldName = (*I)->getNameAsString();
@@ -4422,7 +4422,7 @@ std::string RewriteModernObjC::SynthesizeBlockImpl(BlockExpr *CE, std::string Ta
44224422
Constructor += ", int flags=0)";
44234423
// Initialize all "by copy" arguments.
44244424
bool firsTime = true;
4425-
for (SmallVector<ValueDecl*,8>::iterator I = BlockByCopyDecls.begin(),
4425+
for (SmallVectorImpl<ValueDecl *>::iterator I = BlockByCopyDecls.begin(),
44264426
E = BlockByCopyDecls.end(); I != E; ++I) {
44274427
std::string Name = (*I)->getNameAsString();
44284428
if (firsTime) {
@@ -4437,7 +4437,7 @@ std::string RewriteModernObjC::SynthesizeBlockImpl(BlockExpr *CE, std::string Ta
44374437
Constructor += Name + "(_" + Name + ")";
44384438
}
44394439
// Initialize all "by ref" arguments.
4440-
for (SmallVector<ValueDecl*,8>::iterator I = BlockByRefDecls.begin(),
4440+
for (SmallVectorImpl<ValueDecl *>::iterator I = BlockByRefDecls.begin(),
44414441
E = BlockByRefDecls.end(); I != E; ++I) {
44424442
std::string Name = (*I)->getNameAsString();
44434443
if (firsTime) {
@@ -5520,7 +5520,7 @@ Stmt *RewriteModernObjC::SynthBlockInitExpr(BlockExpr *Exp,
55205520
if (BlockDeclRefs.size()) {
55215521
Expr *Exp;
55225522
// Output all "by copy" declarations.
5523-
for (SmallVector<ValueDecl*,8>::iterator I = BlockByCopyDecls.begin(),
5523+
for (SmallVectorImpl<ValueDecl *>::iterator I = BlockByCopyDecls.begin(),
55245524
E = BlockByCopyDecls.end(); I != E; ++I) {
55255525
if (isObjCType((*I)->getType())) {
55265526
// FIXME: Conform to ABI ([[obj retain] autorelease]).
@@ -5554,7 +5554,7 @@ Stmt *RewriteModernObjC::SynthBlockInitExpr(BlockExpr *Exp,
55545554
InitExprs.push_back(Exp);
55555555
}
55565556
// Output all "by ref" declarations.
5557-
for (SmallVector<ValueDecl*,8>::iterator I = BlockByRefDecls.begin(),
5557+
for (SmallVectorImpl<ValueDecl *>::iterator I = BlockByRefDecls.begin(),
55585558
E = BlockByRefDecls.end(); I != E; ++I) {
55595559
ValueDecl *ND = (*I);
55605560
std::string Name(ND->getNameAsString());

‎lib/Rewrite/Frontend/RewriteObjC.cpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -3366,7 +3366,7 @@ std::string RewriteObjC::SynthesizeBlockFunc(BlockExpr *CE, int i,
33663366

33673367
// Create local declarations to avoid rewriting all closure decl ref exprs.
33683368
// First, emit a declaration for all "by ref" decls.
3369-
for (SmallVector<ValueDecl*,8>::iterator I = BlockByRefDecls.begin(),
3369+
for (SmallVectorImpl<ValueDecl *>::iterator I = BlockByRefDecls.begin(),
33703370
E = BlockByRefDecls.end(); I != E; ++I) {
33713371
S += " ";
33723372
std::string Name = (*I)->getNameAsString();
@@ -3377,7 +3377,7 @@ std::string RewriteObjC::SynthesizeBlockFunc(BlockExpr *CE, int i,
33773377
S += Name + " = __cself->" + (*I)->getNameAsString() + "; // bound by ref\n";
33783378
}
33793379
// Next, emit a declaration for all "by copy" declarations.
3380-
for (SmallVector<ValueDecl*,8>::iterator I = BlockByCopyDecls.begin(),
3380+
for (SmallVectorImpl<ValueDecl *>::iterator I = BlockByCopyDecls.begin(),
33813381
E = BlockByCopyDecls.end(); I != E; ++I) {
33823382
S += " ";
33833383
// Handle nested closure invocation. For example:
@@ -3478,7 +3478,7 @@ std::string RewriteObjC::SynthesizeBlockImpl(BlockExpr *CE, std::string Tag,
34783478

34793479
if (BlockDeclRefs.size()) {
34803480
// Output all "by copy" declarations.
3481-
for (SmallVector<ValueDecl*,8>::iterator I = BlockByCopyDecls.begin(),
3481+
for (SmallVectorImpl<ValueDecl *>::iterator I = BlockByCopyDecls.begin(),
34823482
E = BlockByCopyDecls.end(); I != E; ++I) {
34833483
S += " ";
34843484
std::string FieldName = (*I)->getNameAsString();
@@ -3507,7 +3507,7 @@ std::string RewriteObjC::SynthesizeBlockImpl(BlockExpr *CE, std::string Tag,
35073507
S += FieldName + ";\n";
35083508
}
35093509
// Output all "by ref" declarations.
3510-
for (SmallVector<ValueDecl*,8>::iterator I = BlockByRefDecls.begin(),
3510+
for (SmallVectorImpl<ValueDecl *>::iterator I = BlockByRefDecls.begin(),
35113511
E = BlockByRefDecls.end(); I != E; ++I) {
35123512
S += " ";
35133513
std::string FieldName = (*I)->getNameAsString();
@@ -3526,7 +3526,7 @@ std::string RewriteObjC::SynthesizeBlockImpl(BlockExpr *CE, std::string Tag,
35263526
Constructor += ", int flags=0)";
35273527
// Initialize all "by copy" arguments.
35283528
bool firsTime = true;
3529-
for (SmallVector<ValueDecl*,8>::iterator I = BlockByCopyDecls.begin(),
3529+
for (SmallVectorImpl<ValueDecl *>::iterator I = BlockByCopyDecls.begin(),
35303530
E = BlockByCopyDecls.end(); I != E; ++I) {
35313531
std::string Name = (*I)->getNameAsString();
35323532
if (firsTime) {
@@ -3541,7 +3541,7 @@ std::string RewriteObjC::SynthesizeBlockImpl(BlockExpr *CE, std::string Tag,
35413541
Constructor += Name + "(_" + Name + ")";
35423542
}
35433543
// Initialize all "by ref" arguments.
3544-
for (SmallVector<ValueDecl*,8>::iterator I = BlockByRefDecls.begin(),
3544+
for (SmallVectorImpl<ValueDecl *>::iterator I = BlockByRefDecls.begin(),
35453545
E = BlockByRefDecls.end(); I != E; ++I) {
35463546
std::string Name = (*I)->getNameAsString();
35473547
if (firsTime) {
@@ -4548,7 +4548,7 @@ Stmt *RewriteObjC::SynthBlockInitExpr(BlockExpr *Exp,
45484548
if (BlockDeclRefs.size()) {
45494549
Expr *Exp;
45504550
// Output all "by copy" declarations.
4551-
for (SmallVector<ValueDecl*,8>::iterator I = BlockByCopyDecls.begin(),
4551+
for (SmallVectorImpl<ValueDecl *>::iterator I = BlockByCopyDecls.begin(),
45524552
E = BlockByCopyDecls.end(); I != E; ++I) {
45534553
if (isObjCType((*I)->getType())) {
45544554
// FIXME: Conform to ABI ([[obj retain] autorelease]).
@@ -4582,7 +4582,7 @@ Stmt *RewriteObjC::SynthBlockInitExpr(BlockExpr *Exp,
45824582
InitExprs.push_back(Exp);
45834583
}
45844584
// Output all "by ref" declarations.
4585-
for (SmallVector<ValueDecl*,8>::iterator I = BlockByRefDecls.begin(),
4585+
for (SmallVectorImpl<ValueDecl *>::iterator I = BlockByRefDecls.begin(),
45864586
E = BlockByRefDecls.end(); I != E; ++I) {
45874587
ValueDecl *ND = (*I);
45884588
std::string Name(ND->getNameAsString());

‎lib/Sema/SemaDecl.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -5810,7 +5810,7 @@ static NamedDecl* DiagnoseInvalidRedeclaration(
58105810
if (CXXMethodDecl *NewMD = dyn_cast<CXXMethodDecl>(NewFD))
58115811
NewFDisConst = NewMD->isConst();
58125812

5813-
for (SmallVector<std::pair<FunctionDecl *, unsigned>, 1>::iterator
5813+
for (SmallVectorImpl<std::pair<FunctionDecl *, unsigned>>::iterator
58145814
NearMatch = NearMatches.begin(), NearMatchEnd = NearMatches.end();
58155815
NearMatch != NearMatchEnd; ++NearMatch) {
58165816
FunctionDecl *FD = NearMatch->first;

‎lib/Sema/SemaExpr.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1350,7 +1350,7 @@ Sema::CreateGenericSelectionExpr(SourceLocation KeyLoc,
13501350
Diag(ControllingExpr->getLocStart(), diag::err_generic_sel_multi_match)
13511351
<< ControllingExpr->getSourceRange() << ControllingExpr->getType()
13521352
<< (unsigned) CompatIndices.size();
1353-
for (SmallVector<unsigned, 1>::iterator I = CompatIndices.begin(),
1353+
for (SmallVectorImpl<unsigned>::iterator I = CompatIndices.begin(),
13541354
E = CompatIndices.end(); I != E; ++I) {
13551355
Diag(Types[*I]->getTypeLoc().getBeginLoc(),
13561356
diag::note_compat_assoc)

‎lib/Sema/SemaInit.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -3383,7 +3383,7 @@ static OverloadingResult TryRefInitWithConversionFunction(Sema &S,
33833383
// be changed while iterating (e.g. because of deserialization).
33843384
// To be safe we copy the lookup results to a new container.
33853385
SmallVector<NamedDecl*, 16> Ctors(R.begin(), R.end());
3386-
for (SmallVector<NamedDecl*, 16>::iterator
3386+
for (SmallVectorImpl<NamedDecl *>::iterator
33873387
CI = Ctors.begin(), CE = Ctors.end(); CI != CE; ++CI) {
33883388
NamedDecl *D = *CI;
33893389
DeclAccessPair FoundDecl = DeclAccessPair::make(D, D->getAccess());
@@ -4009,7 +4009,7 @@ static void TryUserDefinedConversion(Sema &S,
40094009
// be changed while iterating. To be safe we copy the lookup results
40104010
// to a new container.
40114011
SmallVector<NamedDecl*, 8> CopyOfCon(R.begin(), R.end());
4012-
for (SmallVector<NamedDecl*, 8>::iterator
4012+
for (SmallVectorImpl<NamedDecl *>::iterator
40134013
Con = CopyOfCon.begin(), ConEnd = CopyOfCon.end();
40144014
Con != ConEnd; ++Con) {
40154015
NamedDecl *D = *Con;
@@ -4716,7 +4716,7 @@ static void LookupCopyAndMoveConstructors(Sema &S,
47164716
// be changed while iterating (e.g. because of deserialization).
47174717
// To be safe we copy the lookup results to a new container.
47184718
SmallVector<NamedDecl*, 16> Ctors(R.begin(), R.end());
4719-
for (SmallVector<NamedDecl*, 16>::iterator
4719+
for (SmallVectorImpl<NamedDecl *>::iterator
47204720
CI = Ctors.begin(), CE = Ctors.end(); CI != CE; ++CI) {
47214721
NamedDecl *D = *CI;
47224722
CXXConstructorDecl *Constructor = 0;

‎lib/Sema/SemaLambda.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -608,10 +608,10 @@ void Sema::ActOnStartOfLambdaDefinition(LambdaIntroducer &Intro,
608608
// Handle explicit captures.
609609
SourceLocation PrevCaptureLoc
610610
= Intro.Default == LCD_None? Intro.Range.getBegin() : Intro.DefaultLoc;
611-
for (SmallVector<LambdaCapture, 4>::const_iterator
612-
C = Intro.Captures.begin(),
613-
E = Intro.Captures.end();
614-
C != E;
611+
for (SmallVectorImpl<LambdaCapture>::const_iterator
612+
C = Intro.Captures.begin(),
613+
E = Intro.Captures.end();
614+
C != E;
615615
PrevCaptureLoc = C->Loc, ++C) {
616616
if (C->Kind == LCK_This) {
617617
// C++11 [expr.prim.lambda]p8:

‎lib/Sema/SemaLookup.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -3470,8 +3470,8 @@ void NamespaceSpecifierSet::SortNamespaces() {
34703470
std::sort(sortedDistances.begin(), sortedDistances.end());
34713471

34723472
Specifiers.clear();
3473-
for (SmallVector<unsigned, 4>::iterator DI = sortedDistances.begin(),
3474-
DIEnd = sortedDistances.end();
3473+
for (SmallVectorImpl<unsigned>::iterator DI = sortedDistances.begin(),
3474+
DIEnd = sortedDistances.end();
34753475
DI != DIEnd; ++DI) {
34763476
SpecifierInfoList &SpecList = DistanceMap[*DI];
34773477
Specifiers.append(SpecList.begin(), SpecList.end());

‎lib/Sema/SemaStmt.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1411,7 +1411,7 @@ namespace {
14111411
// Load SourceRanges into diagnostic if there is room.
14121412
// Otherwise, load the SourceRange of the conditional expression.
14131413
if (Ranges.size() <= PartialDiagnostic::MaxArguments)
1414-
for (SmallVector<SourceRange, 10>::iterator I = Ranges.begin(),
1414+
for (SmallVectorImpl<SourceRange>::iterator I = Ranges.begin(),
14151415
E = Ranges.end();
14161416
I != E; ++I)
14171417
PDiag << *I;

0 commit comments

Comments
 (0)