@@ -12536,10 +12536,9 @@ static const Expr *ignorePointerCastsAndParens(const Expr *E) {
12536
12536
static bool isDesignatorAtObjectEnd(const ASTContext &Ctx, const LValue &LVal) {
12537
12537
assert(!LVal.Designator.Invalid);
12538
12538
12539
- auto IsLastOrInvalidFieldDecl = [&Ctx](const FieldDecl *FD, bool &Invalid ) {
12539
+ auto IsLastOrInvalidFieldDecl = [&Ctx](const FieldDecl *FD) {
12540
12540
const RecordDecl *Parent = FD->getParent();
12541
- Invalid = Parent->isInvalidDecl();
12542
- if (Invalid || Parent->isUnion())
12541
+ if (Parent->isInvalidDecl() || Parent->isUnion())
12543
12542
return true;
12544
12543
const ASTRecordLayout &Layout = Ctx.getASTRecordLayout(Parent);
12545
12544
return FD->getFieldIndex() + 1 == Layout.getFieldCount();
@@ -12548,14 +12547,12 @@ static bool isDesignatorAtObjectEnd(const ASTContext &Ctx, const LValue &LVal) {
12548
12547
auto &Base = LVal.getLValueBase();
12549
12548
if (auto *ME = dyn_cast_or_null<MemberExpr>(Base.dyn_cast<const Expr *>())) {
12550
12549
if (auto *FD = dyn_cast<FieldDecl>(ME->getMemberDecl())) {
12551
- bool Invalid;
12552
- if (!IsLastOrInvalidFieldDecl(FD, Invalid))
12553
- return Invalid;
12550
+ if (!IsLastOrInvalidFieldDecl(FD))
12551
+ return false;
12554
12552
} else if (auto *IFD = dyn_cast<IndirectFieldDecl>(ME->getMemberDecl())) {
12555
12553
for (auto *FD : IFD->chain()) {
12556
- bool Invalid;
12557
- if (!IsLastOrInvalidFieldDecl(cast<FieldDecl>(FD), Invalid))
12558
- return Invalid;
12554
+ if (!IsLastOrInvalidFieldDecl(cast<FieldDecl>(FD)))
12555
+ return false;
12559
12556
}
12560
12557
}
12561
12558
}
@@ -12591,9 +12588,8 @@ static bool isDesignatorAtObjectEnd(const ASTContext &Ctx, const LValue &LVal) {
12591
12588
return false;
12592
12589
BaseType = CT->getElementType();
12593
12590
} else if (auto *FD = getAsField(Entry)) {
12594
- bool Invalid;
12595
- if (!IsLastOrInvalidFieldDecl(FD, Invalid))
12596
- return Invalid;
12591
+ if (!IsLastOrInvalidFieldDecl(FD))
12592
+ return false;
12597
12593
BaseType = FD->getType();
12598
12594
} else {
12599
12595
assert(getAsBaseClass(Entry) && "Expecting cast to a base class");
0 commit comments