Skip to content

[clang][NFC] Use range-based for loops #96831

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.

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 3 commits into from
Jul 1, 2024
Merged
Changes from all commits
Commits
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
63 changes: 31 additions & 32 deletions clang/lib/AST/DeclCXX.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1521,11 +1521,11 @@ void CXXRecordDecl::setCaptures(ASTContext &Context,
auto *ToCapture = (LambdaCapture *)Context.Allocate(sizeof(LambdaCapture) *
Captures.size());
Data.AddCaptureList(Context, ToCapture);
for (unsigned I = 0, N = Captures.size(); I != N; ++I) {
if (Captures[I].isExplicit())
for (const LambdaCapture &C : Captures) {
if (C.isExplicit())
++Data.NumExplicitCaptures;

new (ToCapture) LambdaCapture(Captures[I]);
new (ToCapture) LambdaCapture(C);
ToCapture++;
}

Expand Down Expand Up @@ -2056,40 +2056,39 @@ void CXXRecordDecl::completeDefinition() {
completeDefinition(nullptr);
}

static bool hasPureVirtualFinalOverrider(
const CXXRecordDecl &RD, const CXXFinalOverriderMap *FinalOverriders) {
if (!FinalOverriders) {
CXXFinalOverriderMap MyFinalOverriders;
RD.getFinalOverriders(MyFinalOverriders);
return hasPureVirtualFinalOverrider(RD, &MyFinalOverriders);
}

for (const CXXFinalOverriderMap::value_type &
OverridingMethodsEntry : *FinalOverriders) {
for (const auto &[_, SubobjOverrides] : OverridingMethodsEntry.second) {
assert(SubobjOverrides.size() > 0 &&
"All virtual functions have overriding virtual functions");

if (SubobjOverrides.front().Method->isPureVirtual())
return true;
}
}
return false;
}

void CXXRecordDecl::completeDefinition(CXXFinalOverriderMap *FinalOverriders) {
RecordDecl::completeDefinition();

// If the class may be abstract (but hasn't been marked as such), check for
// any pure final overriders.
if (mayBeAbstract()) {
CXXFinalOverriderMap MyFinalOverriders;
if (!FinalOverriders) {
getFinalOverriders(MyFinalOverriders);
FinalOverriders = &MyFinalOverriders;
}

bool Done = false;
for (CXXFinalOverriderMap::iterator M = FinalOverriders->begin(),
MEnd = FinalOverriders->end();
M != MEnd && !Done; ++M) {
for (OverridingMethods::iterator SO = M->second.begin(),
SOEnd = M->second.end();
SO != SOEnd && !Done; ++SO) {
assert(SO->second.size() > 0 &&
"All virtual functions have overriding virtual functions");

// C++ [class.abstract]p4:
// A class is abstract if it contains or inherits at least one
// pure virtual function for which the final overrider is pure
// virtual.
if (SO->second.front().Method->isPureVirtual()) {
data().Abstract = true;
Done = true;
break;
}
}
}
}
//
// C++ [class.abstract]p4:
// A class is abstract if it contains or inherits at least one
// pure virtual function for which the final overrider is pure
// virtual.
if (mayBeAbstract() && hasPureVirtualFinalOverrider(*this, FinalOverriders))
markAbstract();

// Set access bits correctly on the directly-declared conversions.
for (conversion_iterator I = conversion_begin(), E = conversion_end();
Expand Down
Loading