[Driver] Use a range constructor of StringSet (NFC) #133201
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This patch uses a range constructor to collapse:
llvm::StringSet<> Dest;
for (const auto &S : Src)
Dest.insert(S);
down to:
llvm::StringSet<> Dest(llvm::from_range, Src);
llvmbot
added
clang
|
@llvm/pr-subscribers-clang-driver Author: Kazu Hirata (kazutakahirata) ChangesThis patch uses a range constructor to collapse: llvm::StringSet<> Dest; down to: llvm::StringSet<> Dest(llvm::from_range, Src); Full diff: https://github.com/llvm/llvm-project/pull/133201.diff 2 Files Affected:
diff --git a/clang/lib/Driver/Job.cpp b/clang/lib/Driver/Job.cpp
index ae2f1cd1f56c9..4619b8c1887be 100644
--- a/clang/lib/Driver/Job.cpp
+++ b/clang/lib/Driver/Job.cpp
@@ -140,9 +140,7 @@ void Command::buildArgvForResponseFile(
return;
}
- llvm::StringSet<> Inputs;
- for (const auto *InputName : InputFileList)
- Inputs.insert(InputName);
+ llvm::StringSet<> Inputs(llvm::from_range, InputFileList);
Out.push_back(Executable);
if (PrependArg)
diff --git a/clang/lib/Driver/Multilib.cpp b/clang/lib/Driver/Multilib.cpp
index a92ad4718fb6e..87fa1af54a8ea 100644
--- a/clang/lib/Driver/Multilib.cpp
+++ b/clang/lib/Driver/Multilib.cpp
@@ -60,9 +60,7 @@ void Multilib::print(raw_ostream &OS) const {
bool Multilib::operator==(const Multilib &Other) const {
// Check whether the flags sets match
// allowing for the match to be order invariant
- llvm::StringSet<> MyFlags;
- for (const auto &Flag : Flags)
- MyFlags.insert(Flag);
+ llvm::StringSet<> MyFlags(llvm::from_range, Flags);
for (const auto &Flag : Other.Flags)
if (!MyFlags.contains(Flag))
@@ -272,9 +270,7 @@ bool MultilibSet::select(
llvm::StringSet<>
MultilibSet::expandFlags(const Multilib::flags_list &InFlags) const {
- llvm::StringSet<> Result;
- for (const auto &F : InFlags)
- Result.insert(F);
+ llvm::StringSet<> Result(llvm::from_range, InFlags);
for (const FlagMatcher &M : FlagMatchers) {
std::string RegexString(M.Match);
|
|
@llvm/pr-subscribers-clang Author: Kazu Hirata (kazutakahirata) ChangesThis patch uses a range constructor to collapse: llvm::StringSet<> Dest; down to: llvm::StringSet<> Dest(llvm::from_range, Src); Full diff: https://github.com/llvm/llvm-project/pull/133201.diff 2 Files Affected:
diff --git a/clang/lib/Driver/Job.cpp b/clang/lib/Driver/Job.cpp
index ae2f1cd1f56c9..4619b8c1887be 100644
--- a/clang/lib/Driver/Job.cpp
+++ b/clang/lib/Driver/Job.cpp
@@ -140,9 +140,7 @@ void Command::buildArgvForResponseFile(
return;
}
- llvm::StringSet<> Inputs;
- for (const auto *InputName : InputFileList)
- Inputs.insert(InputName);
+ llvm::StringSet<> Inputs(llvm::from_range, InputFileList);
Out.push_back(Executable);
if (PrependArg)
diff --git a/clang/lib/Driver/Multilib.cpp b/clang/lib/Driver/Multilib.cpp
index a92ad4718fb6e..87fa1af54a8ea 100644
--- a/clang/lib/Driver/Multilib.cpp
+++ b/clang/lib/Driver/Multilib.cpp
@@ -60,9 +60,7 @@ void Multilib::print(raw_ostream &OS) const {
bool Multilib::operator==(const Multilib &Other) const {
// Check whether the flags sets match
// allowing for the match to be order invariant
- llvm::StringSet<> MyFlags;
- for (const auto &Flag : Flags)
- MyFlags.insert(Flag);
+ llvm::StringSet<> MyFlags(llvm::from_range, Flags);
for (const auto &Flag : Other.Flags)
if (!MyFlags.contains(Flag))
@@ -272,9 +270,7 @@ bool MultilibSet::select(
llvm::StringSet<>
MultilibSet::expandFlags(const Multilib::flags_list &InFlags) const {
- llvm::StringSet<> Result;
- for (const auto &F : InFlags)
- Result.insert(F);
+ llvm::StringSet<> Result(llvm::from_range, InFlags);
for (const FlagMatcher &M : FlagMatchers) {
std::string RegexString(M.Match);
|
kuhar
approved these changes
Mar 27, 2025
kazutakahirata
changed the title
Oops. Thank you for pointing this out! |
MaskRay
approved these changes
Mar 27, 2025
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/143/builds/6485 Here is the relevant piece of the build log for the reference |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/4/builds/5888 Here is the relevant piece of the build log for the reference |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This patch uses a range constructor to collapse:
llvm::StringSet<> Dest;
for (const auto &S : Src)
Dest.insert(S);
down to:
llvm::StringSet<> Dest(llvm::from_range, Src);