From 1c20e70fd99fc15e6a0c4366223ab39a13d2be0a Mon Sep 17 00:00:00 2001 From: Aaron Ballman Date: Fri, 7 Mar 2014 18:36:15 +0000 Subject: [PATCH] Renaming the chains() ranged iterator to chain() per suggestion by Richard Smith. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@203262 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/AST/Decl.h | 6 +++--- .../clang/StaticAnalyzer/Core/PathSensitive/ProgramState.h | 2 +- lib/AST/ASTImporter.cpp | 2 +- lib/AST/ExprConstant.cpp | 4 ++-- lib/AST/RecordLayoutBuilder.cpp | 2 +- lib/CodeGen/CGClass.cpp | 2 +- lib/Sema/SemaDecl.cpp | 2 +- lib/Sema/SemaDeclCXX.cpp | 4 ++-- lib/Sema/SemaExpr.cpp | 2 +- lib/Sema/SemaTemplateInstantiateDecl.cpp | 2 +- lib/Serialization/ASTWriterDecl.cpp | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/clang/AST/Decl.h b/include/clang/AST/Decl.h index 3a6bc2b493..081101520f 100644 --- a/include/clang/AST/Decl.h +++ b/include/clang/AST/Decl.h @@ -2333,11 +2333,11 @@ public: typedef NamedDecl * const *chain_iterator; typedef llvm::iterator_range chain_range; - chain_range chains() const { + chain_range chain() const { return chain_range(Chaining, Chaining + ChainingSize); } - chain_iterator chain_begin() const { return chains().begin(); } - chain_iterator chain_end() const { return chains().end(); } + chain_iterator chain_begin() const { return chain().begin(); } + chain_iterator chain_end() const { return chain().end(); } unsigned getChainingSize() const { return ChainingSize; } diff --git a/include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState.h b/include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState.h index 1cb0decf11..f10a14c0c7 100644 --- a/include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState.h +++ b/include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState.h @@ -676,7 +676,7 @@ inline SVal ProgramState::getLValue(const FieldDecl *D, SVal Base) const { inline SVal ProgramState::getLValue(const IndirectFieldDecl *D, SVal Base) const { StoreManager &SM = *getStateManager().StoreMgr; - for (const auto *I : D->chains()) { + for (const auto *I : D->chain()) { Base = SM.getLValueField(cast(I), Base); } diff --git a/lib/AST/ASTImporter.cpp b/lib/AST/ASTImporter.cpp index 51fcca85df..ca02989933 100644 --- a/lib/AST/ASTImporter.cpp +++ b/lib/AST/ASTImporter.cpp @@ -2967,7 +2967,7 @@ Decl *ASTNodeImporter::VisitIndirectFieldDecl(IndirectFieldDecl *D) { new (Importer.getToContext())NamedDecl*[D->getChainingSize()]; unsigned i = 0; - for (auto *PI : D->chains()) { + for (auto *PI : D->chain()) { Decl *D = Importer.Import(PI); if (!D) return 0; diff --git a/lib/AST/ExprConstant.cpp b/lib/AST/ExprConstant.cpp index a2b5867581..12acb9bf24 100644 --- a/lib/AST/ExprConstant.cpp +++ b/lib/AST/ExprConstant.cpp @@ -1832,7 +1832,7 @@ static bool HandleLValueMember(EvalInfo &Info, const Expr *E, LValue &LVal, static bool HandleLValueIndirectMember(EvalInfo &Info, const Expr *E, LValue &LVal, const IndirectFieldDecl *IFD) { - for (const auto *C : IFD->chains()) + for (const auto *C : IFD->chain()) if (!HandleLValueMember(Info, E, LVal, cast(C))) return false; return true; @@ -3720,7 +3720,7 @@ static bool HandleConstructorCall(SourceLocation CallLoc, const LValue &This, } else if (IndirectFieldDecl *IFD = (*I)->getIndirectMember()) { // Walk the indirect field decl's chain to find the object to initialize, // and make sure we've initialized every step along it. - for (auto *C : IFD->chains()) { + for (auto *C : IFD->chain()) { FD = cast(C); CXXRecordDecl *CD = cast(FD->getParent()); // Switch the union field if it differs. This happens if we had diff --git a/lib/AST/RecordLayoutBuilder.cpp b/lib/AST/RecordLayoutBuilder.cpp index a44a1a436e..bd6fdd6bd3 100644 --- a/lib/AST/RecordLayoutBuilder.cpp +++ b/lib/AST/RecordLayoutBuilder.cpp @@ -3002,7 +3002,7 @@ uint64_t ASTContext::getFieldOffset(const ValueDecl *VD) const { const IndirectFieldDecl *IFD = cast(VD); OffsetInBits = 0; - for (const auto *CI : IFD->chains()) + for (const auto *CI : IFD->chain()) OffsetInBits += ::getFieldOffset(*this, cast(CI)); } diff --git a/lib/CodeGen/CGClass.cpp b/lib/CodeGen/CGClass.cpp index 83c1ece12f..cc8f20c0e9 100644 --- a/lib/CodeGen/CGClass.cpp +++ b/lib/CodeGen/CGClass.cpp @@ -549,7 +549,7 @@ static void EmitMemberInitializer(CodeGenFunction &CGF, // If we are initializing an anonymous union field, drill down to // the field. IndirectFieldDecl *IndirectField = MemberInit->getIndirectMember(); - for (const auto *I : IndirectField->chains()) + for (const auto *I : IndirectField->chain()) LHS = CGF.EmitLValueForFieldInitialization(LHS, cast(I)); FieldType = MemberInit->getIndirectMember()->getAnonField()->getType(); } else { diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp index f57c7fccf2..2ff2d8626e 100644 --- a/lib/Sema/SemaDecl.cpp +++ b/lib/Sema/SemaDecl.cpp @@ -3487,7 +3487,7 @@ static bool InjectAnonymousStructOrUnionMembers(Sema &SemaRef, Scope *S, // anonymous union is declared. unsigned OldChainingSize = Chaining.size(); if (IndirectFieldDecl *IF = dyn_cast(VD)) - for (auto *PI : IF->chains()) + for (auto *PI : IF->chain()) Chaining.push_back(PI); else Chaining.push_back(VD); diff --git a/lib/Sema/SemaDeclCXX.cpp b/lib/Sema/SemaDeclCXX.cpp index ccf2e5790c..54ba508383 100644 --- a/lib/Sema/SemaDeclCXX.cpp +++ b/lib/Sema/SemaDeclCXX.cpp @@ -3413,7 +3413,7 @@ struct BaseAndFieldInfo { if (!Indirect) return isInactiveUnionMember(Field); - for (auto *C : Indirect->chains()) { + for (auto *C : Indirect->chain()) { FieldDecl *Field = dyn_cast(C); if (Field && isInactiveUnionMember(Field)) return true; @@ -3562,7 +3562,7 @@ bool Sema::SetCtorInitializers(CXXConstructorDecl *Constructor, bool AnyErrors, Info.AllBaseFields[Member->getAnyMember()] = Member; if (IndirectFieldDecl *F = Member->getIndirectMember()) { - for (auto *C : F->chains()) { + for (auto *C : F->chain()) { FieldDecl *FD = dyn_cast(C); if (FD && FD->getParent()->isUnion()) Info.ActiveUnionMember.insert(std::make_pair( diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp index cb8a1b63df..f32b46cfee 100644 --- a/lib/Sema/SemaExpr.cpp +++ b/lib/Sema/SemaExpr.cpp @@ -10229,7 +10229,7 @@ ExprResult Sema::BuildBuiltinOffsetOf(SourceLocation BuiltinLoc, } if (IndirectMemberDecl) { - for (auto *FI : IndirectMemberDecl->chains()) { + for (auto *FI : IndirectMemberDecl->chain()) { assert(isa(FI)); Comps.push_back(OffsetOfNode(OC.LocStart, cast(FI), OC.LocEnd)); diff --git a/lib/Sema/SemaTemplateInstantiateDecl.cpp b/lib/Sema/SemaTemplateInstantiateDecl.cpp index b96aed9764..259c0030d0 100644 --- a/lib/Sema/SemaTemplateInstantiateDecl.cpp +++ b/lib/Sema/SemaTemplateInstantiateDecl.cpp @@ -562,7 +562,7 @@ Decl *TemplateDeclInstantiator::VisitIndirectFieldDecl(IndirectFieldDecl *D) { new (SemaRef.Context)NamedDecl*[D->getChainingSize()]; int i = 0; - for (auto *PI : D->chains()) { + for (auto *PI : D->chain()) { NamedDecl *Next = SemaRef.FindInstantiatedDecl(D->getLocation(), PI, TemplateArgs); if (!Next) diff --git a/lib/Serialization/ASTWriterDecl.cpp b/lib/Serialization/ASTWriterDecl.cpp index f4fabc10e5..18a196cf3a 100644 --- a/lib/Serialization/ASTWriterDecl.cpp +++ b/lib/Serialization/ASTWriterDecl.cpp @@ -686,7 +686,7 @@ void ASTDeclWriter::VisitIndirectFieldDecl(IndirectFieldDecl *D) { VisitValueDecl(D); Record.push_back(D->getChainingSize()); - for (const auto *P : D->chains()) + for (const auto *P : D->chain()) Writer.AddDeclRef(P, Record); Code = serialization::DECL_INDIRECTFIELD; } -- 2.40.0