Skip to content

[NFC][clang-tidy]refactor isAssignmentToMemberOf in PreferMemberInitializerCheck #71006

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 2, 2023
Merged

[NFC][clang-tidy]refactor isAssignmentToMemberOf in PreferMemberInitializerCheck #71006

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
69b7688
[NFC][clang-tidy]refactor isAssignmentToMemberOf in PreferMemberIniti…
HerrCai0907 Nov 2, 2023
02201db
refactor
HerrCai0907 Nov 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 22 additions & 16 deletions clang-tools-extra/clang-tidy/cppcoreguidelines/PreferMemberInitializerCheck.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,45 +118,50 @@ static void updateAssignmentLevel(
}
}

static std::pair<const FieldDecl *, const Expr *>
struct AssignmentPair {
const FieldDecl *Field;
const Expr *Init;
};

static std::optional<AssignmentPair>
isAssignmentToMemberOf(const CXXRecordDecl *Rec, const Stmt *S,
const CXXConstructorDecl *Ctor) {
if (const auto *BO = dyn_cast<BinaryOperator>(S)) {
if (BO->getOpcode() != BO_Assign)
return std::make_pair(nullptr, nullptr);
return {};

const auto *ME = dyn_cast<MemberExpr>(BO->getLHS()->IgnoreParenImpCasts());
if (!ME)
return std::make_pair(nullptr, nullptr);
return {};

const auto *Field = dyn_cast<FieldDecl>(ME->getMemberDecl());
if (!Field)
return std::make_pair(nullptr, nullptr);
return {};

if (!isa<CXXThisExpr>(ME->getBase()))
return std::make_pair(nullptr, nullptr);
return {};
const Expr *Init = BO->getRHS()->IgnoreParenImpCasts();
return std::make_pair(Field, Init);
return AssignmentPair{Field, Init};
}
if (const auto *COCE = dyn_cast<CXXOperatorCallExpr>(S)) {
if (COCE->getOperator() != OO_Equal)
return std::make_pair(nullptr, nullptr);
return {};

const auto *ME =
dyn_cast<MemberExpr>(COCE->getArg(0)->IgnoreParenImpCasts());
if (!ME)
return std::make_pair(nullptr, nullptr);
return {};

const auto *Field = dyn_cast<FieldDecl>(ME->getMemberDecl());
if (!Field)
return std::make_pair(nullptr, nullptr);
return {};

if (!isa<CXXThisExpr>(ME->getBase()))
return std::make_pair(nullptr, nullptr);
return {};
const Expr *Init = COCE->getArg(1)->IgnoreParenImpCasts();
return std::make_pair(Field, Init);
return AssignmentPair{Field, Init};
}
return std::make_pair(nullptr, nullptr);
return {};
}

PreferMemberInitializerCheck::PreferMemberInitializerCheck(
Expand Down Expand Up @@ -216,11 +221,12 @@ void PreferMemberInitializerCheck::check(
return;
}

const FieldDecl *Field = nullptr;
const Expr *InitValue = nullptr;
std::tie(Field, InitValue) = isAssignmentToMemberOf(Class, S, Ctor);
if (!Field)
std::optional<AssignmentPair> AssignmentToMember =
isAssignmentToMemberOf(Class, S, Ctor);
if (!AssignmentToMember)
continue;
const FieldDecl *Field = AssignmentToMember->Field;
const Expr *InitValue = AssignmentToMember->Init;
updateAssignmentLevel(Field, InitValue, Ctor, AssignedFields);
if (!canAdvanceAssignment(AssignedFields[Field]))
continue;
Expand Down