Skip to content

Commit a244907

Browse files
[clang] Use range-based for loops (NFC) (#146811)
Note that LLVM Coding Standards discourages std::for_each and llvm::for_each unless the callable object already exists.
1 parent 5df748d commit a244907

File tree

5 files changed

+18
-25
lines changed

5 files changed

+18
-25
lines changed

clang/include/clang/Sema/DeclSpec.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1821,8 +1821,8 @@ class DecompositionDeclarator {
18211821
if (DeleteBindings)
18221822
delete[] Bindings;
18231823
else
1824-
llvm::for_each(llvm::MutableArrayRef(Bindings, NumBindings),
1825-
[](Binding &B) { B.Attrs.reset(); });
1824+
for (Binding &B : llvm::MutableArrayRef(Bindings, NumBindings))
1825+
B.Attrs.reset();
18261826
Bindings = nullptr;
18271827
NumBindings = 0;
18281828
DeleteBindings = false;

clang/lib/CIR/CodeGen/CIRGenOpenACCClause.cpp

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,8 @@ class OpenACCClauseCIREmitter final
7575
void setLastDeviceTypeClause(const OpenACCDeviceTypeClause &clause) {
7676
lastDeviceTypeValues.clear();
7777

78-
llvm::for_each(clause.getArchitectures(),
79-
[this](const DeviceTypeArgument &arg) {
80-
lastDeviceTypeValues.push_back(
81-
decodeDeviceType(arg.getIdentifierInfo()));
82-
});
78+
for (const DeviceTypeArgument &arg : clause.getArchitectures())
79+
lastDeviceTypeValues.push_back(decodeDeviceType(arg.getIdentifierInfo()));
8380
}
8481

8582
mlir::Value emitIntExpr(const Expr *intExpr) {
@@ -511,11 +508,9 @@ class OpenACCClauseCIREmitter final
511508

512509
if constexpr (isOneOfTypes<OpTy, mlir::acc::InitOp,
513510
mlir::acc::ShutdownOp>) {
514-
llvm::for_each(
515-
clause.getArchitectures(), [this](const DeviceTypeArgument &arg) {
516-
operation.addDeviceType(builder.getContext(),
517-
decodeDeviceType(arg.getIdentifierInfo()));
518-
});
511+
for (const DeviceTypeArgument &arg : clause.getArchitectures())
512+
operation.addDeviceType(builder.getContext(),
513+
decodeDeviceType(arg.getIdentifierInfo()));
519514
} else if constexpr (isOneOfTypes<OpTy, mlir::acc::SetOp>) {
520515
assert(!operation.getDeviceTypeAttr() && "already have device-type?");
521516
assert(clause.getArchitectures().size() <= 1);

clang/lib/Driver/ToolChains/HIPSPV.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -149,11 +149,9 @@ void HIPSPVToolChain::addClangTargetOptions(
149149
CC1Args.append(
150150
{"-fvisibility=hidden", "-fapply-global-visibility-to-externs"});
151151

152-
llvm::for_each(getDeviceLibs(DriverArgs),
153-
[&](const BitCodeLibraryInfo &BCFile) {
154-
CC1Args.append({"-mlink-builtin-bitcode",
155-
DriverArgs.MakeArgString(BCFile.Path)});
156-
});
152+
for (const BitCodeLibraryInfo &BCFile : getDeviceLibs(DriverArgs))
153+
CC1Args.append(
154+
{"-mlink-builtin-bitcode", DriverArgs.MakeArgString(BCFile.Path)});
157155
}
158156

159157
Tool *HIPSPVToolChain::buildLinker() const {

clang/tools/clang-installapi/ClangInstallAPI.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ static bool run(ArrayRef<const char *> Args, const char *ProgName) {
102102

103103
if (!Opts.DriverOpts.DylibToVerify.empty()) {
104104
TargetList Targets;
105-
llvm::for_each(Opts.DriverOpts.Targets,
106-
[&](const auto &T) { Targets.push_back(T.first); });
105+
for (const auto &T : Opts.DriverOpts.Targets)
106+
Targets.push_back(T.first);
107107
if (!Ctx.Verifier->verifyBinaryAttrs(Targets, Ctx.BA, Ctx.Reexports,
108108
Opts.LinkerOpts.AllowableClients,
109109
Opts.LinkerOpts.RPaths, Ctx.FT))

clang/tools/clang-installapi/Options.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ getArgListFromJSON(const StringRef Input, llvm::opt::OptTable *Table,
100100
}
101101

102102
std::vector<const char *> CArgs(Storage.size());
103-
llvm::for_each(Storage,
104-
[&CArgs](StringRef Str) { CArgs.emplace_back(Str.data()); });
103+
for (StringRef Str : Storage)
104+
CArgs.emplace_back(Str.data());
105105

106106
unsigned MissingArgIndex, MissingArgCount;
107107
return Table->ParseArgs(CArgs, MissingArgIndex, MissingArgCount);
@@ -730,8 +730,8 @@ Options::Options(DiagnosticsEngine &Diag, FileManager *FM,
730730
// After all InstallAPI necessary arguments have been collected. Go back and
731731
// assign values that were unknown before the clang driver opt table was used.
732732
ArchitectureSet AllArchs;
733-
llvm::for_each(DriverOpts.Targets,
734-
[&AllArchs](const auto &T) { AllArchs.set(T.first.Arch); });
733+
for (const auto &T : DriverOpts.Targets)
734+
AllArchs.set(T.first.Arch);
735735
auto assignDefaultLibAttrs = [&AllArchs](LibAttrs &Attrs) {
736736
for (auto &[_, Archs] : Attrs.get())
737737
if (Archs.empty())
@@ -794,8 +794,8 @@ std::pair<LibAttrs, ReexportedInterfaces> Options::getReexportedLibraries() {
794794
};
795795

796796
PlatformSet Platforms;
797-
llvm::for_each(DriverOpts.Targets,
798-
[&](const auto &T) { Platforms.insert(T.first.Platform); });
797+
for (const auto &T : DriverOpts.Targets)
798+
Platforms.insert(T.first.Platform);
799799
// Populate search paths by looking at user paths before system ones.
800800
PathSeq FwkSearchPaths(FEOpts.FwkPaths.begin(), FEOpts.FwkPaths.end());
801801
for (const PlatformType P : Platforms) {

0 commit comments

Comments
 (0)