Skip to content

Commit 6686159

Browse files
committed
Simplify checker
1 parent 4d9861a commit 6686159

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

clang/lib/CodeGen/CGRecordLayoutBuilder.cpp

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -933,19 +933,16 @@ void CGRecordLowering::calculateZeroInit() {
933933
// Verify accumulateBitfields computed the correct storage representations.
934934
void CGRecordLowering::checkTailPadding() {
935935
#ifndef NDEBUG
936-
std::vector<MemberInfo>::iterator Prior = Members.begin();
937-
CharUnits Tail = getSize(Prior->Data);
938-
for (std::vector<MemberInfo>::iterator Member = Prior + 1,
939-
MemberEnd = Members.end();
940-
Member != MemberEnd; ++Member) {
936+
auto Tail = CharUnits::Zero();
937+
for (auto M : Members) {
941938
// Only members with data and the scissor can cut into tail padding.
942-
if (!Member->Data && Member->Kind != MemberInfo::Scissor)
939+
if (!M.Data && M.Kind != MemberInfo::Scissor)
943940
continue;
944941

945-
assert(Member->Offset >= Tail && "bitfield not already clipped");
946-
if (Member->Data)
947-
Prior = Member;
948-
Tail = Prior->Offset + getSize(Prior->Data);
942+
assert(M.Offset >= Tail && "bitfield access unit not already clipped");
943+
Tail = M.Offset;
944+
if (M.Data)
945+
Tail += getSize(M.Data);
949946
}
950947
#endif
951948
}

0 commit comments

Comments
 (0)