averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #41673 from tshortli/inlining-availability-checking

Browse Source 
Add -target-min-inlining-version to aid type checking for inlinable functions in resilient libraries
This commit is contained in:
Allan Shortlidge
2022-03-07 17:30:59 -08:00
committed by GitHub
parent 62575ed77c eccc086838
commit e25b822f7a
17 changed files with 954 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
lib/Frontend/CompilerInvocation.cpp
View File

@@ -800,29 +800,63 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
Diags.diagnose(SourceLoc(), diag::error_unsupported_target_os, TargetArgOS);
}
// Parse the SDK version.
if (Arg *A = Args.getLastArg(options::OPT_target_sdk_version)) {
auto vers = version::Version::parseVersionString(
A->getValue(), SourceLoc(), &Diags);
if (vers.hasValue()) {
Opts.SDKVersion = *vers;
} else {
Diags.diagnose(SourceLoc(), diag::error_invalid_arg_value,
A->getAsString(Args), A->getValue());
}
}
// First, set up default minimum inlining target versions.
auto getDefaultMinimumInliningTargetVersion =
[&](const llvm::Triple &triple) -> llvm::VersionTuple {
#if SWIFT_DEFAULT_TARGET_MIN_INLINING_VERSION_TO_ABI
// In ABI-stable modules, default to the version where the target's ABI
// was first frozen; older versions will use that one's backwards
// compatibility libraries.
if (FrontendOpts.EnableLibraryEvolution)
if (auto abiStability = minimumABIStableOSVersionForTriple(triple))
// FIXME: Should we raise it to the minimum supported OS version for
// architectures which were born ABI-stable?
return *abiStability;
#endif
// Parse the target variant SDK version.
if (Arg *A = Args.getLastArg(options::OPT_target_variant_sdk_version)) {
auto vers = version::Version::parseVersionString(
A->getValue(), SourceLoc(), &Diags);
if (vers.hasValue()) {
Opts.VariantSDKVersion = *vers;
} else {
Diags.diagnose(SourceLoc(), diag::error_invalid_arg_value,
A->getAsString(Args), A->getValue());
}
}
// In ABI-unstable modules, we will never have to interoperate with
// older versions of the module, so we should default to the minimum
// deployment target.
unsigned major, minor, patch;
if (triple.isMacOSX())
triple.getMacOSXVersion(major, minor, patch);
else
triple.getOSVersion(major, minor, patch);
return llvm::VersionTuple(major, minor, patch);
};
Opts.MinimumInliningTargetVersion =
getDefaultMinimumInliningTargetVersion(Opts.Target);
// Parse OS version number arguments.
auto parseVersionArg = [&](OptSpecifier opt) -> Optional<llvm::VersionTuple> {
Arg *A = Args.getLastArg(opt);
if (!A)
return None;
if (StringRef(A->getValue()) == "target")
return Opts.getMinPlatformVersion();
if (StringRef(A->getValue()) == "abi")
return minimumABIStableOSVersionForTriple(Opts.Target);
if (auto vers = version::Version::parseVersionString(A->getValue(),
SourceLoc(), &Diags))
return (llvm::VersionTuple)*vers;
Diags.diagnose(SourceLoc(), diag::error_invalid_arg_value,
A->getAsString(Args), A->getValue());
return None;
};
if (auto vers = parseVersionArg(OPT_min_inlining_target_version))
// FIXME: Should we diagnose if it's below the default?
Opts.MinimumInliningTargetVersion = *vers;
if (auto vers = parseVersionArg(OPT_target_sdk_version))
Opts.SDKVersion = *vers;
if (auto vers = parseVersionArg(OPT_target_variant_sdk_version))
Opts.VariantSDKVersion = *vers;
// Get the SDK name.
if (Arg *A = Args.getLastArg(options::OPT_target_sdk_name)) {