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

Frontend: Refactor how flags are saved for module interfaces.

Browse Source 
There are two axes on which a saved frontend flag can be categorized for
printing in a `.swiftinterface` file:

1. Whether the flag is "ignorable" or not.
2. Which levels of interface the flag should be in (public, package).

This refactor ensures that those two axes are modeled independently and
prepares the infrastructure to allow flags to appear in the private and package
interfaces without being included in the public interface.
This commit is contained in:
Allan Shortlidge
2024-07-02 16:09:15 -07:00
parent a28b729594
commit f6e30ea83c
3 changed files with 64 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/Frontend/ModuleInterfaceSupport.cpp
View File

@@ -60,15 +60,12 @@ static void printToolVersionAndFlagsComment(raw_ostream &out,
<< InterfaceFormatVersion << "\n";
out << "// " SWIFT_COMPILER_VERSION_KEY ": "
<< ToolsVersion << "\n";
out << "// " SWIFT_MODULE_FLAGS_KEY ": "
<< Opts.Flags;
out << "// " SWIFT_MODULE_FLAGS_KEY ": " << Opts.PublicFlags.Flags;
// Adding package-name can be disabled in non-package
// swiftinterfaces; add only to package.swiftinterface
// in such case.
if (Opts.printPackageInterface() &&
!Opts.FlagsForPackageOnly.empty())
out << " " << Opts.FlagsForPackageOnly;
// Append flags that are for the package interface only (e.g. -package-name
// when -disable-print-package-name-for-non-package-interface is specified).
if (Opts.printPackageInterface() && !Opts.PackageFlags.Flags.empty())
out << " " << Opts.PackageFlags.Flags;
// Insert additional -module-alias flags
if (Opts.AliasModuleNames) {
@@ -104,10 +101,14 @@ static void printToolVersionAndFlagsComment(raw_ostream &out,
}
out << "\n";
if (!Opts.IgnorableFlags.empty()) {
if (!Opts.PublicFlags.IgnorableFlags.empty()) {
out << "// " SWIFT_MODULE_FLAGS_IGNORABLE_KEY ": "
<< Opts.IgnorableFlags << "\n";
<< Opts.PublicFlags.IgnorableFlags << "\n";
}
// Append ignorable flags that are for the package interface only.
if (Opts.printPackageInterface() && !Opts.PackageFlags.IgnorableFlags.empty())
out << " " << Opts.PackageFlags.IgnorableFlags;
}
std::string