Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions clang/lib/Sema/SemaDeclCXX.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3782,21 +3782,21 @@ namespace {
if (CheckReferenceOnly && !ReferenceField)
return true;

llvm::SmallVector<unsigned, 4> UsedFieldIndex;
// Discard the first field since it is the field decl that is being
// initialized.
for (const FieldDecl *FD : llvm::drop_begin(llvm::reverse(Fields)))
UsedFieldIndex.push_back(FD->getFieldIndex());

for (auto UsedIter = UsedFieldIndex.begin(),
UsedEnd = UsedFieldIndex.end(),
OrigIter = InitFieldIndex.begin(),
OrigEnd = InitFieldIndex.end();
UsedIter != UsedEnd && OrigIter != OrigEnd; ++UsedIter, ++OrigIter) {
if (*UsedIter < *OrigIter)
auto UsedFields = llvm::drop_begin(llvm::reverse(Fields));
auto UsedIter = UsedFields.begin();
const auto UsedEnd = UsedFields.end();

for (const unsigned Orig : InitFieldIndex) {
if (UsedIter == UsedEnd)
break;
const unsigned UsedIndex = (*UsedIter)->getFieldIndex();
if (UsedIndex < Orig)
return true;
if (*UsedIter > *OrigIter)
if (UsedIndex > Orig)
break;
++UsedIter;
}

return false;
Expand Down