[Frontend] Move the package name option from frontend to LangOptions

Author: xymus

include/swift/Basic/LangOptions.h

@@ -396,6 +396,9 @@ namespace swift {
     /// Access or distribution level of the whole module being parsed.
     LibraryLevel LibraryLevel = LibraryLevel::Other;
 
+    /// The name of the package this module belongs to.
+    std::string PackageName;
+
     /// Warn about cases where Swift 3 would infer @objc but later versions
     /// of Swift do not.
     Swift3ObjCInferenceWarnings WarnSwift3ObjCInference =

include/swift/Frontend/FrontendOptions.h

@@ -64,9 +64,6 @@ class FrontendOptions {
   /// The name of the library to link against when using this module.
   std::string ModuleLinkName;
 
-  /// The name of the package this module belongs to.
-  std::string PackageName;
-
   /// Module name to use when referenced in clients module interfaces.
   std::string ExportAsName;
 

lib/Frontend/ArgsToFrontendOptionsConverter.cpp

@@ -269,16 +269,6 @@ bool ArgsToFrontendOptionsConverter::convert(
   if (const Arg *A = Args.getLastArg(OPT_module_link_name))
     Opts.ModuleLinkName = A->getValue();
 
-  if (const Arg *A = Args.getLastArg(OPT_package_name)) {
-    auto pkgName = A->getValue();
-    if (!Lexer::isIdentifier(pkgName))
-      Diags.diagnose(SourceLoc(), diag::error_bad_package_name, pkgName);
-    else if (pkgName == STDLIB_NAME)
-      Diags.diagnose(SourceLoc(), diag::error_stdlib_package_name, pkgName);
-    else
-      Opts.PackageName = pkgName;
-  }
-
   if (const Arg *A = Args.getLastArg(OPT_export_as)) {
     auto exportAs = A->getValue();
     if (!Lexer::isIdentifier(exportAs))

lib/Frontend/CompilerInvocation.cpp

@@ -739,6 +739,16 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
     }
   }
 
+  if (const Arg *A = Args.getLastArg(OPT_package_name)) {
+    auto pkgName = A->getValue();
+    if (!Lexer::isIdentifier(pkgName))
+      Diags.diagnose(SourceLoc(), diag::error_bad_package_name, pkgName);
+    else if (pkgName == STDLIB_NAME)
+      Diags.diagnose(SourceLoc(), diag::error_stdlib_package_name, pkgName);
+    else
+      Opts.PackageName = pkgName;
+  }
+
   if (const Arg *A = Args.getLastArg(OPT_require_explicit_availability_EQ)) {
     StringRef diagLevel = A->getValue();
     if (diagLevel == "warn") {

lib/Frontend/Frontend.cpp

@@ -1088,9 +1088,9 @@ ModuleDecl *CompilerInstance::getMainModule() const {
       MainModule->setABIName(getASTContext().getIdentifier(
           Invocation.getFrontendOptions().ModuleABIName));
     }
-    if (!Invocation.getFrontendOptions().PackageName.empty()) {
+    if (!Invocation.getLangOptions().PackageName.empty()) {
       MainModule->setPackageName(getASTContext().getIdentifier(
-          Invocation.getFrontendOptions().PackageName));
+          Invocation.getLangOptions().PackageName));
     }
     if (!Invocation.getFrontendOptions().ExportAsName.empty()) {
       MainModule->setExportAsName(getASTContext().getIdentifier(