[clang] [clang][Darwin] Simply deployment version assignment in the Driver (PR #142013)
via cfe-commits
cfe-commits at lists.llvm.org
Thu May 29 12:17:18 PDT 2025
github-actions[bot] wrote:
<!--LLVM CODE FORMAT COMMENT: {clang-format}-->
:warning: C/C++ code formatter, clang-format found issues in your code. :warning:
<details>
<summary>
You can test this locally with the following command:
</summary>
``````````bash
git-clang-format --diff HEAD~1 HEAD --extensions cpp,c -- clang/lib/Driver/ToolChains/Darwin.cpp clang/test/Driver/darwin-debug-flags.c clang/test/Driver/darwin-version.c
``````````
</details>
<details>
<summary>
View the diff from clang-format here.
</summary>
``````````diff
diff --git a/clang/lib/Driver/ToolChains/Darwin.cpp b/clang/lib/Driver/ToolChains/Darwin.cpp
index 3bfb81a19..80d578c07 100644
--- a/clang/lib/Driver/ToolChains/Darwin.cpp
+++ b/clang/lib/Driver/ToolChains/Darwin.cpp
@@ -1842,7 +1842,8 @@ struct DarwinPlatform {
}
static DarwinPlatform createOSVersionArg(DarwinPlatformKind Platform, Arg *A,
bool IsSimulator) {
- DarwinPlatform Result{OSVersionArg, Platform, getVersionFromString(A->getValue()), A};
+ DarwinPlatform Result{OSVersionArg, Platform,
+ getVersionFromString(A->getValue()), A};
if (IsSimulator)
Result.Environment = DarwinEnvironmentKind::Simulator;
return Result;
@@ -1850,14 +1851,16 @@ struct DarwinPlatform {
static DarwinPlatform createDeploymentTargetEnv(DarwinPlatformKind Platform,
StringRef EnvVarName,
StringRef OSVersion) {
- DarwinPlatform Result(DeploymentTargetEnv, Platform, getVersionFromString(OSVersion));
+ DarwinPlatform Result(DeploymentTargetEnv, Platform,
+ getVersionFromString(OSVersion));
Result.EnvVarName = EnvVarName;
return Result;
}
static DarwinPlatform createFromSDK(DarwinPlatformKind Platform,
StringRef Value,
bool IsSimulator = false) {
- DarwinPlatform Result(InferredFromSDK, Platform, getVersionFromString(Value));
+ DarwinPlatform Result(InferredFromSDK, Platform,
+ getVersionFromString(Value));
if (IsSimulator)
Result.Environment = DarwinEnvironmentKind::Simulator;
Result.InferSimulatorFromArch = false;
@@ -1990,28 +1993,27 @@ getDeploymentTargetFromOSVersionArg(DerivedArgList &Args,
: TvOSVersion ? TvOSVersion : WatchOSVersion)
->getAsString(Args);
}
- return GetDarwinPlatform(Darwin::MacOS, macOSVersion, /*IsSimulator=*/false);
-
+ return GetDarwinPlatform(Darwin::MacOS, macOSVersion,
+ /*IsSimulator=*/false);
+
} else if (iOSVersion) {
if (TvOSVersion || WatchOSVersion) {
TheDriver.Diag(diag::err_drv_argument_not_allowed_with)
<< iOSVersion->getAsString(Args)
<< (TvOSVersion ? TvOSVersion : WatchOSVersion)->getAsString(Args);
}
- return GetDarwinPlatform(
- Darwin::IPhoneOS, iOSVersion,
- iOSVersion->getOption().getID() ==
- options::OPT_mios_simulator_version_min_EQ);
+ return GetDarwinPlatform(Darwin::IPhoneOS, iOSVersion,
+ iOSVersion->getOption().getID() ==
+ options::OPT_mios_simulator_version_min_EQ);
} else if (TvOSVersion) {
if (WatchOSVersion) {
TheDriver.Diag(diag::err_drv_argument_not_allowed_with)
<< TvOSVersion->getAsString(Args)
<< WatchOSVersion->getAsString(Args);
}
- return GetDarwinPlatform(
- Darwin::TvOS, TvOSVersion,
- TvOSVersion->getOption().getID() ==
- options::OPT_mtvos_simulator_version_min_EQ);
+ return GetDarwinPlatform(Darwin::TvOS, TvOSVersion,
+ TvOSVersion->getOption().getID() ==
+ options::OPT_mtvos_simulator_version_min_EQ);
} else if (WatchOSVersion)
return GetDarwinPlatform(
Darwin::WatchOS, WatchOSVersion,
``````````
</details>
https://github.com/llvm/llvm-project/pull/142013
More information about the cfe-commits
mailing list