Renaming the chains() ranged iterator to chain() per suggestion by Richard Smith.
llvm-svn: 203262
This commit is contained in:
parent
1391608234
commit
29c9460d3e
|
@ -2333,11 +2333,11 @@ public:
|
|||
typedef NamedDecl * const *chain_iterator;
|
||||
typedef llvm::iterator_range<chain_iterator> 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; }
|
||||
|
||||
|
|
|
@ -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<FieldDecl>(I), Base);
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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<FieldDecl>(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<FieldDecl>(C);
|
||||
CXXRecordDecl *CD = cast<CXXRecordDecl>(FD->getParent());
|
||||
// Switch the union field if it differs. This happens if we had
|
||||
|
|
|
@ -3002,7 +3002,7 @@ uint64_t ASTContext::getFieldOffset(const ValueDecl *VD) const {
|
|||
const IndirectFieldDecl *IFD = cast<IndirectFieldDecl>(VD);
|
||||
|
||||
OffsetInBits = 0;
|
||||
for (const auto *CI : IFD->chains())
|
||||
for (const auto *CI : IFD->chain())
|
||||
OffsetInBits += ::getFieldOffset(*this, cast<FieldDecl>(CI));
|
||||
}
|
||||
|
||||
|
|
|
@ -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<FieldDecl>(I));
|
||||
FieldType = MemberInit->getIndirectMember()->getAnonField()->getType();
|
||||
} else {
|
||||
|
|
|
@ -3487,7 +3487,7 @@ static bool InjectAnonymousStructOrUnionMembers(Sema &SemaRef, Scope *S,
|
|||
// anonymous union is declared.
|
||||
unsigned OldChainingSize = Chaining.size();
|
||||
if (IndirectFieldDecl *IF = dyn_cast<IndirectFieldDecl>(VD))
|
||||
for (auto *PI : IF->chains())
|
||||
for (auto *PI : IF->chain())
|
||||
Chaining.push_back(PI);
|
||||
else
|
||||
Chaining.push_back(VD);
|
||||
|
|
|
@ -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<FieldDecl>(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<FieldDecl>(C);
|
||||
if (FD && FD->getParent()->isUnion())
|
||||
Info.ActiveUnionMember.insert(std::make_pair(
|
||||
|
|
|
@ -10229,7 +10229,7 @@ ExprResult Sema::BuildBuiltinOffsetOf(SourceLocation BuiltinLoc,
|
|||
}
|
||||
|
||||
if (IndirectMemberDecl) {
|
||||
for (auto *FI : IndirectMemberDecl->chains()) {
|
||||
for (auto *FI : IndirectMemberDecl->chain()) {
|
||||
assert(isa<FieldDecl>(FI));
|
||||
Comps.push_back(OffsetOfNode(OC.LocStart,
|
||||
cast<FieldDecl>(FI), OC.LocEnd));
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue