Merge pull request #76450 from swiftlang/elsh/re-revert-pkg-name-pr

Revert "Revert "Do not print package-name in non-package interface by…
This commit is contained in:
Ellie Shin
2024-09-13 12:53:59 -07:00
committed by GitHub
5 changed files with 10 additions and 12 deletions

View File

@@ -525,7 +525,6 @@ static void ParseModuleInterfaceArgs(ModuleInterfaceOptions &Opts,
Args.hasArg(OPT_debug_emit_invalid_swiftinterface_syntax);
Opts.PrintMissingImports =
!Args.hasArg(OPT_disable_print_missing_imports_in_module_interface);
Opts.DisablePackageNameForNonPackageInterface |= Args.hasArg(OPT_disable_print_package_name_for_non_package_interface);
if (const Arg *A = Args.getLastArg(OPT_library_level)) {
StringRef contents = A->getValue();
@@ -557,8 +556,8 @@ static bool ShouldIncludeModuleInterfaceArg(const Arg *A) {
static bool IsPackageInterfaceFlag(const Arg *A, ArgList &Args) {
return A->getOption().matches(options::OPT_package_name) &&
Args.hasArg(
options::OPT_disable_print_package_name_for_non_package_interface);
!Args.hasArg(
options::OPT_print_package_name_in_non_package_interface);
}
static bool IsPrivateInterfaceFlag(const Arg *A, ArgList &Args) {