[clang][Darwin] Minor args cleanup #139142
Merged
Conversation
This file contains hidden or 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
I just realized that ArgList.hasArg takes multiple arguments. Consolidate the two calls into one.
llvmbot
added
clang
Member
|
@llvm/pr-subscribers-clang-driver Author: Ian Anderson (ian-twilightcoder) ChangesI just realized that ArgList.hasArg takes multiple arguments. Consolidate the two calls into one. Full diff: https://github.com/llvm/llvm-project/pull/139142.diff 1 Files Affected:
diff --git a/clang/lib/Driver/ToolChains/Darwin.cpp b/clang/lib/Driver/ToolChains/Darwin.cpp
index 76fa2d121db2a..fe3952ee76229 100644
--- a/clang/lib/Driver/ToolChains/Darwin.cpp
+++ b/clang/lib/Driver/ToolChains/Darwin.cpp
@@ -2582,8 +2582,7 @@ void DarwinClang::AddClangSystemIncludeArgs(
llvm::opt::ArgStringList &CC1Args) const {
AppleMachO::AddClangSystemIncludeArgs(DriverArgs, CC1Args);
- if (DriverArgs.hasArg(options::OPT_nostdinc) ||
- DriverArgs.hasArg(options::OPT_nostdlibinc))
+ if (DriverArgs.hasArg(options::OPT_nostdinc, options::OPT_nostdlibinc))
return;
llvm::SmallString<128> Sysroot = GetEffectiveSysroot(DriverArgs);
|
Member
|
@llvm/pr-subscribers-clang Author: Ian Anderson (ian-twilightcoder) ChangesI just realized that ArgList.hasArg takes multiple arguments. Consolidate the two calls into one. Full diff: https://github.com/llvm/llvm-project/pull/139142.diff 1 Files Affected:
diff --git a/clang/lib/Driver/ToolChains/Darwin.cpp b/clang/lib/Driver/ToolChains/Darwin.cpp
index 76fa2d121db2a..fe3952ee76229 100644
--- a/clang/lib/Driver/ToolChains/Darwin.cpp
+++ b/clang/lib/Driver/ToolChains/Darwin.cpp
@@ -2582,8 +2582,7 @@ void DarwinClang::AddClangSystemIncludeArgs(
llvm::opt::ArgStringList &CC1Args) const {
AppleMachO::AddClangSystemIncludeArgs(DriverArgs, CC1Args);
- if (DriverArgs.hasArg(options::OPT_nostdinc) ||
- DriverArgs.hasArg(options::OPT_nostdlibinc))
+ if (DriverArgs.hasArg(options::OPT_nostdinc, options::OPT_nostdlibinc))
return;
llvm::SmallString<128> Sysroot = GetEffectiveSysroot(DriverArgs);
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
I just realized that ArgList.hasArg takes multiple arguments. Consolidate the two calls into one.