Merge pull request #85869 from egorzhdan/egorzhdan/remove-interop-compat-version

[cxx-interop] Remove compatibility versions
This commit is contained in:
Egor Zhdan
2025-12-09 15:45:00 +00:00
committed by GitHub
7 changed files with 4 additions and 85 deletions

View File

@@ -333,10 +333,6 @@ namespace swift {
/// disabled because it is not complete.
bool EnableCXXInterop = false;
/// The C++ interoperability source compatibility version. Defaults
/// to the Swift language version.
version::Version cxxInteropCompatVersion;
/// What version of C++ interoperability a textual interface was originally
/// generated with (if at all).
std::optional<version::Version> FormalCxxInteropMode;
@@ -753,13 +749,6 @@ namespace swift {
return EffectiveLanguageVersion.isVersionAtLeast(major, minor);
}
/// Whether the C++ interoperability compatibility version is at least
/// 'major'.
bool isCxxInteropCompatVersionAtLeast(unsigned major,
unsigned minor = 0) const {
return cxxInteropCompatVersion.isVersionAtLeast(major, minor);
}
/// Sets the "_hasAtomicBitWidth" conditional.
void setHasAtomicBitWidth(llvm::Triple triple);

View File

@@ -184,11 +184,6 @@ StringRef getCurrentCompilerSerializationTag();
/// same serialization tag.
StringRef getCurrentCompilerChannel();
/// Retrieves the value of the upcoming C++ interoperability compatibility
/// version that's going to be presented as some new concrete version to the
/// users.
unsigned getUpcomingCxxInteropCompatVersion();
/// Retrieves the version of the running compiler. It could be a tag or
/// a "development" version that only has major/minor.
std::string getCompilerVersion();