s/ModuleInterfaceOptionIgnorablePrivate/ModuleInterfaceOption and formatting

Author: elsh

include/swift/AST/Module.h

@@ -210,7 +210,8 @@ class PackageUnit: public DeclContext {
   /// Equality check via package name instead of pointer comparison.
   /// Returns false if the name is empty.
   bool isSamePackageAs(PackageUnit *other) {
-    if (!other) return false;
+    if (!other)
+      return false;
     return !(getName().empty()) && getName() == other->getName();
   }
 };

include/swift/Option/Options.td

@@ -548,7 +548,7 @@ def module_abi_name : Separate<["-"], "module-abi-name">,
   Flags<[FrontendOption, ModuleInterfaceOption]>,
   HelpText<"ABI name to use for the contents of this module">;
 def package_name : Separate<["-"], "package-name">,
-  Flags<[FrontendOption, ModuleInterfaceOptionIgnorablePrivate]>,
+  Flags<[FrontendOption, ModuleInterfaceOption]>,
   HelpText<"Name of the package the module belongs to">;
 def export_as : Separate<["-"], "export-as">,
   Flags<[FrontendOption, ModuleInterfaceOption]>,

lib/AST/Decl.cpp

@@ -4293,14 +4293,16 @@ static bool checkAccessUsingAccessScopes(const DeclContext *useDC,
   AccessScope accessScope = getAccessScopeForFormalAccess(
       VD, access, useDC,
       /*treatUsableFromInlineAsPublic*/ includeInlineable);
-  if (accessScope.getDeclContext() == useDC) return true;
-  if (!AccessScope(useDC).isChildOf(accessScope)) return false;
-
+  if (accessScope.getDeclContext() == useDC)
+    return true;
+  if (!AccessScope(useDC).isChildOf(accessScope))
+    return false;
   // useDC is null only when caller wants to skip non-public type checks.
-  if (!useDC) return true;
-
+  if (!useDC)
+    return true;
   // Check SPI access
-  if (!VD->isSPI()) return true;
+  if (!VD->isSPI())
+    return true;
   auto useSF = dyn_cast<SourceFile>(useDC->getModuleScopeContext());
   return !useSF || useSF->isImportedAsSPI(VD) ||
          VD->getDeclContext()->getParentModule() == useDC->getParentModule();

lib/Frontend/ModuleInterfaceSupport.cpp

@@ -92,10 +92,6 @@ static void printToolVersionAndFlagsComment(raw_ostream &out,
       }
     }
   }
-  if (!M->getPackageName().empty()) {
-    StringRef pkgName = M->getPackageName().str();
-    out << " -package-name " << pkgName;
-  }
   out << "\n";
 
   if (!Opts.IgnorableFlags.empty()) {