Merge pull request #69210 from xymus/export-as-module-interface-by-default

ModuleInterface: Always ignore export-as for printing references in private swiftinterfaces
This commit is contained in:
Alexis Laferrière
2023-10-17 16:41:37 -07:00
committed by GitHub
5 changed files with 31 additions and 57 deletions

View File

@@ -822,13 +822,7 @@ bool swift::emitSwiftInterface(raw_ostream &out,
printImports(out, Opts, M, aliasModuleNamesTargets);
static bool forceUseExportedModuleNameInPublicOnly =
getenv("SWIFT_DEBUG_USE_EXPORTED_MODULE_NAME_IN_PUBLIC_ONLY");
bool useExportedModuleNameInPublicOnly =
M->getASTContext().LangOpts.hasFeature(Feature::ModuleInterfaceExportAs) ||
forceUseExportedModuleNameInPublicOnly;
bool useExportedModuleNames = !(useExportedModuleNameInPublicOnly &&
Opts.PrintPrivateInterfaceContent);
bool useExportedModuleNames = !Opts.PrintPrivateInterfaceContent;
const PrintOptions printOptions = PrintOptions::printSwiftInterfaceFile(
M, Opts.PreserveTypesAsWritten, Opts.PrintFullConvention,