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

[cxx-interop] add 'upcoming-swift' compat version

Browse Source 
This version will be used to gate new source breaking changes for C++ interoperability
This commit is contained in:
Alex Lorenz
2023-07-25 14:10:01 -07:00
committed by Alex Lorenz
parent 5abb580b3d
commit d7b62b3c40
6 changed files with 59 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lib/Frontend/CompilerInvocation.cpp
View File

@@ -486,15 +486,20 @@ enum class CxxCompatMode {
off
};
static CxxCompatMode validateCxxInteropCompatibilityMode(StringRef mode) {
static std::pair<CxxCompatMode, version::Version>
validateCxxInteropCompatibilityMode(StringRef mode) {
if (mode == "off")
return CxxCompatMode::off;
return {CxxCompatMode::off, {}};
if (mode == "default")
return CxxCompatMode::enabled;
// FIXME: Drop swift-5.9.
return {CxxCompatMode::enabled, {}};
if (mode == "upcoming-swift")
return {CxxCompatMode::enabled,
version::Version({version::getUpcomingCxxInteropCompatVersion()})};
// Swift-5.9 corresponds to the Swift 5 language mode when
// Swift 5 is the default language version.
if (mode == "swift-5.9")
return CxxCompatMode::enabled;
return CxxCompatMode::invalid;
return {CxxCompatMode::enabled, version::Version({5})};
return {CxxCompatMode::invalid, {}};
}
static void diagnoseCxxInteropCompatMode(Arg *verArg, ArgList &Args,
@@ -1066,16 +1071,29 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
}
auto interopCompatMode = validateCxxInteropCompatibilityMode(A->getValue());
Opts.EnableCXXInterop |= (interopCompatMode == CxxCompatMode::enabled);
Opts.EnableCXXInterop |=
(interopCompatMode.first == CxxCompatMode::enabled);
if (Opts.EnableCXXInterop) {
Opts.cxxInteropCompatVersion = interopCompatMode.second;
// The default is tied to the current language version.
if (Opts.cxxInteropCompatVersion.empty())
Opts.cxxInteropCompatVersion =
Opts.EffectiveLanguageVersion.asMajorVersion();
}
if (interopCompatMode == CxxCompatMode::invalid)
if (interopCompatMode.first == CxxCompatMode::invalid)
diagnoseCxxInteropCompatMode(A, Args, Diags);
}
if (Args.hasArg(OPT_enable_experimental_cxx_interop)) {
Diags.diagnose(SourceLoc(), diag::enable_interop_flag_deprecated);
Diags.diagnose(SourceLoc(), diag::swift_will_maintain_compat);
Opts.EnableCXXInterop |= true;
// Using the deprecated option only forces the 'swift-5.9' compat
// mode.
if (Opts.cxxInteropCompatVersion.empty())
Opts.cxxInteropCompatVersion =
validateCxxInteropCompatibilityMode("swift-5.9").second;
}
Opts.EnableObjCInterop =