[GSoC] Swift PR

include/swift/AST/ASTContext.h

@@ -84,6 +84,7 @@ namespace swift {
   class LazyIterableDeclContextData;
   class LazyMemberLoader;
   class ModuleDependencies;
+  class PackageAttr;
   class PatternBindingDecl;
   class PatternBindingInitializer;
   class SourceFile;
@@ -324,6 +325,9 @@ class ASTContext final {
   llvm::DenseMap<SILAutoDiffDerivativeFunctionKey, CanSILFunctionType>
       SILAutoDiffDerivativeFunctions;
 
+  /// Cache of `@package` attributes.
+  llvm::SetVector<std::tuple<StringRef, unsigned, PackageAttr *>> PackageAttrs;
+
   /// Cache of `@differentiable` attributes keyed by parameter indices. Used to
   /// diagnose duplicate `@differentiable` attributes for the same key.
   llvm::DenseMap<std::pair<Decl *, IndexSubset *>, DifferentiableAttr *>

include/swift/AST/Attr.def

@@ -674,6 +674,12 @@ SIMPLE_DECL_ATTR(_assemblyVision, EmitAssemblyVisionRemarks,
   ABIStableToAdd | ABIStableToRemove | APIStableToAdd | APIStableToRemove,
   120)
 
+DECL_ATTR(package, Package, OnImport | 
+  ABIStableToAdd | ABIStableToRemove | 
+  APIStableToAdd | APIStableToRemove |
+  NotSerialized,
+  121)
+
 #undef TYPE_ATTR
 #undef DECL_ATTR_ALIAS
 #undef CONTEXTUAL_DECL_ATTR_ALIAS

include/swift/AST/Attr.h

@@ -1661,6 +1661,45 @@ class OriginallyDefinedInAttr: public DeclAttribute {
   }
 };
 
+/// The `@package` attribute implies its following imports has
+/// external package dependencies.
+/// 
+/// Syntax definition is passed in on frontend calls.
+class PackageAttr final: public DeclAttribute,
+                         public TrailingCallArguments<PackageAttr> {
+  /// The package declaration string.
+  const StringRef PackageDeclaration;
+
+  unsigned NumArgLabels : 16;
+  Expr *Arg;
+
+public:
+  PackageAttr(SourceLoc AtLoc, SourceRange Range,
+              StringRef PackageDeclaration,
+              Expr * Arg,
+              ArrayRef<Identifier> ArgLabels,
+              ArrayRef<SourceLoc> ArgLabelLocs,
+              bool Implicit)
+    : DeclAttribute(DAK_Package, AtLoc, Range, Implicit),
+      PackageDeclaration(PackageDeclaration),
+      Arg(Arg) {
+        NumArgLabels = ArgLabels.size();
+        initializeCallArguments(ArgLabels, ArgLabelLocs);
+      }
+
+  /// The getter of `PackageDeclaration`.
+  const StringRef getPackageDeclaration() {
+    return PackageDeclaration;
+  }
+
+  Expr *getArg() const { return Arg; }
+  unsigned getNumArguments() const { return NumArgLabels; }
+
+  static bool classof(const DeclAttribute *DA) {
+    return DA->getKind() == DAK_Package;
+  }
+};
+
 /// Attribute that marks a function as differentiable.
 ///
 /// Examples:

include/swift/AST/DiagnosticsParse.def

@@ -1860,5 +1860,9 @@ ERROR(expected_closure_literal,none,
 ERROR(expected_multiple_closures_block_rbrace,none,
       "expected '}' at the end of a trailing closures block", ())
 
+// Package declaration errors
+ERROR(package_declarations_not_allowed,none,
+      "package declaration is not allowed", ())
+
 #define UNDEFINE_DIAGNOSTIC_MACROS
 #include "DefineDiagnosticMacros.h"

include/swift/AST/Import.h

@@ -80,6 +80,9 @@ enum class ImportFlags {
   /// implementation detail of this file.
   SPIAccessControl = 0x10,
 
+  /// The module is explicitly marked to be imported from SwiftPM.
+  Package = 0x20,
+
   /// Used for DenseMap.
   Reserved = 0x80
 };

include/swift/Basic/FileTypes.def

@@ -77,6 +77,8 @@ TYPE("json-dependencies",   JSONDependencies,          "dependencies.json",
 // Complete feature information for the given Swift compiler.
 TYPE("json-features",       JSONFeatures,              "features.json",   "")
 
+// Complete package dependency information for the given Swift files as JSON.
+TYPE("package-declarations", PackageDeclarations,      "package-declarations.json", "")
 
 TYPE("index-data",          IndexData,                 "",                "")
 TYPE("index-unit-output-path", IndexUnitOutputPath,    "",                "")

include/swift/Basic/LangOptions.h

@@ -443,6 +443,12 @@ namespace swift {
     // FrontendOptions.
     bool AllowModuleWithCompilerErrors = false;
 
+    // Allow @package attributes in the file.
+    bool AllowPackageDeclarations = false;
+
+    // Ingore @package attributes in the file.
+    bool IgnorePackageDeclarations = false;
+
     /// A helper enum to represent whether or not we customized the default
     /// ASTVerifier behavior via a frontend flag. By default, we do not
     /// customize.

include/swift/Frontend/FrontendOptions.h

@@ -154,6 +154,8 @@ class FrontendOptions {
     ScanDependencies,        ///< Scan dependencies of Swift source files
     PrintVersion,       ///< Print version information.
     PrintFeature,       ///< Print supported feature of this compiler
+
+    PrintPackageDeclarations ///< Print package declarations from the Swift source file
   };
 
   /// Indicates the action the user requested that the frontend perform.
@@ -422,6 +424,9 @@ class FrontendOptions {
   /// Whether to include symbols with SPI information in the symbol graph.
   bool IncludeSPISymbolsInSymbolGraph = false;
 
+  /// Whether to ignore package declarations.
+  bool IgnorePackageDeclarations = false;
+
 private:
   static bool canActionEmitDependencies(ActionType);
   static bool canActionEmitReferenceDependencies(ActionType);

include/swift/Option/FrontendOptions.td

@@ -872,4 +872,8 @@ def new_driver_path
   : Separate<["-"], "new-driver-path">, MetaVarName<"<path>">,
   HelpText<"Path of the new driver to be used">;
 
+def ignore_package_declarations : Flag<["-"], "ignore-package-declarations">,
+  HelpText<"Ignore all package declarations in the file, assuming all external"
+           "dependencies are provided as modules.">;
+
 } // end let Flags = [FrontendOption, NoDriverOption, HelpHidden]

include/swift/Option/Options.td

@@ -1013,6 +1013,10 @@ def dump_pcm : Flag<["-"], "dump-pcm">,
   HelpText<"Dump debugging information about a precompiled Clang module">,
   ModeOpt,
   Flags<[FrontendOption, NoInteractiveOption, DoesNotAffectIncrementalBuild]>;
+def print_package_declarations : Flag<["-"], "print-package-declarations">,
+  HelpText<"Print all package declarations in the file.">,
+  ModeOpt,
+  Flags<[FrontendOption, NoInteractiveOption, DoesNotAffectIncrementalBuild]>;
 
 // Other Modes
 def repl : Flag<["-"], "repl">,

include/swift/Parse/Parser.h

@@ -189,6 +189,16 @@ class Parser {
 
   bool allowTopLevelCode() const;
 
+  bool ignorePackageDeclarations() const {
+    return Context.LangOpts.IgnorePackageDeclarations;
+  }
+  bool allowPackageDeclaration() const {
+    return Context.LangOpts.AllowPackageDeclarations ||
+      Context.LangOpts.IgnorePackageDeclarations;
+  }
+
+  void registerPackageDeclaration(PackageAttr *Package);
+
   const std::vector<Token> &getSplitTokens() const { return SplitTokens; }
 
   void markSplitToken(tok Kind, StringRef Txt);
@@ -1067,6 +1077,10 @@ class Parser {
   ParserResult<ImplementsAttr> parseImplementsAttribute(SourceLoc AtLoc,
                                                         SourceLoc Loc);
 
+  /// Parse the @package attribute.
+  ParserResult<PackageAttr> parsePackageAttribute(SourceLoc AtLoc,
+                                                  SourceLoc Loc);
+
   /// Parse the @differentiable attribute.
   ParserResult<DifferentiableAttr> parseDifferentiableAttribute(SourceLoc AtLoc,
                                                                 SourceLoc Loc);

lib/AST/Attr.cpp

@@ -1239,6 +1239,8 @@ StringRef DeclAttribute::getAttrName() const {
     return "transpose";
   case DAK_CompletionHandlerAsync:
     return "completionHandlerAsync";
+  case DAK_Package:
+    return "package";
   }
   llvm_unreachable("bad DeclAttrKind");
 }

lib/Basic/FileTypes.cpp

@@ -84,6 +84,7 @@ bool file_types::isTextual(ID Id) {
   case file_types::TY_SwiftOverlayFile:
   case file_types::TY_JSONDependencies:
   case file_types::TY_JSONFeatures:
+  case file_types::TY_PackageDeclarations:
     return true;
   case file_types::TY_Image:
   case file_types::TY_Object:
@@ -157,6 +158,7 @@ bool file_types::isAfterLLVM(ID Id) {
   case file_types::TY_JSONDependencies:
   case file_types::TY_JSONFeatures:
   case file_types::TY_IndexUnitOutputPath:
+  case file_types::TY_PackageDeclarations:
     return false;
   case file_types::TY_INVALID:
     llvm_unreachable("Invalid type ID.");
@@ -208,6 +210,7 @@ bool file_types::isPartOfSwiftCompilation(ID Id) {
   case file_types::TY_JSONDependencies:
   case file_types::TY_JSONFeatures:
   case file_types::TY_IndexUnitOutputPath:
+  case file_types::TY_PackageDeclarations:
     return false;
   case file_types::TY_INVALID:
     llvm_unreachable("Invalid type ID.");

lib/Driver/Driver.cpp

@@ -2062,6 +2062,7 @@ void Driver::buildActions(SmallVectorImpl<const Action *> &TopLevelActions,
       case file_types::TY_SwiftOverlayFile:
       case file_types::TY_JSONDependencies:
       case file_types::TY_JSONFeatures:
+      case file_types::TY_PackageDeclarations:
         // We could in theory handle assembly or LLVM input, but let's not.
         // FIXME: What about LTO?
         Diags.diagnose(SourceLoc(), diag::error_unexpected_input_file,

lib/Driver/ToolChains.cpp

@@ -640,6 +640,8 @@ const char *ToolChain::JobContext::computeFrontendModeForCompile() const {
     return "-typecheck";
   case file_types::TY_Remapping:
     return "-update-code";
+  case file_types::TY_PackageDeclarations:
+    return "-print-package-declarations";
   case file_types::TY_Nothing:
     // We were told to output nothing, so get the last mode option and use that.
     if (const Arg *A = Args.getLastArg(options::OPT_modes_Group))
@@ -904,6 +906,7 @@ ToolChain::constructInvocation(const BackendJobAction &job,
     case file_types::TY_IndexData:
     case file_types::TY_JSONDependencies:
     case file_types::TY_JSONFeatures:
+    case file_types::TY_PackageDeclarations:
       llvm_unreachable("Cannot be output from backend job");
     case file_types::TY_Swift:
     case file_types::TY_dSYM:

lib/Frontend/ArgsToFrontendOptionsConverter.cpp

@@ -276,6 +276,8 @@ bool ArgsToFrontendOptionsConverter::convert(
 
   Opts.Static = Args.hasArg(OPT_static);
 
+  Opts.IgnorePackageDeclarations = Args.hasArg(OPT_ignore_package_declarations);
+
   return false;
 }
 
@@ -472,6 +474,9 @@ ArgsToFrontendOptionsConverter::determineRequestedAction(const ArgList &args) {
     return FrontendOptions::ActionType::TypecheckModuleFromInterface;
   if (Opt.matches(OPT_emit_supported_features))
     return FrontendOptions::ActionType::PrintFeature;
+
+  if (Opt.matches(OPT_print_package_declarations))
+    return FrontendOptions::ActionType::PrintPackageDeclarations;
   llvm_unreachable("Unhandled mode option");
 }
 

lib/Frontend/CompilerInvocation.cpp

@@ -774,6 +774,13 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
     Opts.VerifySyntaxTree = true;
   }
 
+  if (FrontendOpts.RequestedAction == FrontendOptions::ActionType::PrintPackageDeclarations) {
+    Opts.AllowPackageDeclarations = true;
+  }
+  if (FrontendOpts.IgnorePackageDeclarations) {
+    Opts.IgnorePackageDeclarations = true;
+  }
+
   // Configure lexing to parse and remember comments if:
   //   - Emitting a swiftdoc/swiftsourceinfo
   //   - Performing index-while-building