Merge pull request #62707 from apple/es-pkg-err

Add error checks for input to -package-name
Resolves rdar://103531208

Author: elsh

include/swift/AST/DiagnosticsFrontend.def

@@ -180,6 +180,12 @@ ERROR(error_stdlib_module_name,none,
       "module name \"%0\" is reserved for the standard library"
       "%select{|; use -module-name flag to specify an alternate name}1",
       (StringRef, bool))
+ERROR(error_bad_package_name,none,
+      "package name \"%0\" is not a valid identifier",
+      (StringRef))
+ERROR(error_stdlib_package_name,none,
+      "package name \"%0\" is reserved for the standard library",
+      (StringRef))
 ERROR(error_stdlib_not_found,Fatal,
       "unable to load standard library for target '%0'", (StringRef))
 ERROR(error_module_alias_invalid_format,none,

lib/Frontend/ArgsToFrontendOptionsConverter.cpp

@@ -269,8 +269,15 @@ 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))
-    Opts.PackageName = 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;
+  }
 
   // This must be called after computing module name, module abi name,
   // and module link name. If computing module aliases is unsuccessful,

test/diagnostics/package-name-diagnostics.swift

@@ -0,0 +1,16 @@
+// RUN: %empty-directory(%t)
+
+// Package name should have valid characters
+// RUN: not %target-swift-frontend -module-name Logging -package-name My-Logging%Pkg %s -emit-module -emit-module-path %t/Logging.swiftmodule 2>&1 | %FileCheck %s -check-prefix CHECK-BAD
+// CHECK-BAD: package name "My-Logging%Pkg" is not a valid identifier
+
+// Package name cannot be a standard library name
+// RUN: not %target-swift-frontend -module-name Logging -package-name Swift %s -emit-module -emit-module-path %t/Logging.swiftmodule 2>&1 | %FileCheck %s -check-prefix CHECK-STDLIB
+// CHECK-STDLIB: package name "Swift" is reserved for the standard library
+
+// Package name can be same as the module name
+// RUN: %target-swift-frontend -module-name Logging -package-name Logging %s -emit-module -emit-module-path %t/Logging.swiftmodule
+// RUN: test -f %t/Logging.swiftmodule
+
+public func log() {}
+