serialization: encode allowable client names in binary module format

Author: nkcsgexi

include/swift/AST/Module.h

@@ -418,7 +418,18 @@ class ModuleDecl
     return UserModuleVersion;
   }
 
+  void addAllowableClientName(Identifier name) {
+    allowableClientNames.push_back(name);
+  }
+  ArrayRef<Identifier> getAllowableClientNames() const {
+    return allowableClientNames;
+  }
 private:
+
+  /// An array of module names that are allowed to import this one.
+  /// Any module can import this one if empty.
+  std::vector<Identifier> allowableClientNames;
+
   /// A cache of this module's underlying module and required bystander if it's
   /// an underscored cross-import overlay.
   Optional<std::pair<ModuleDecl *, Identifier>> declaringModuleAndBystander;

include/swift/Frontend/FrontendOptions.h

@@ -97,6 +97,9 @@ class FrontendOptions {
   /// User-defined module version number.
   llvm::VersionTuple UserModuleVersion;
 
+  /// A set of modules allowed to import this module.
+  std::set<std::string> AllowableClients;
+
   /// Emit index data for imported serialized swift system modules.
   bool IndexSystemModules = false;
 

include/swift/Serialization/SerializationOptions.h

@@ -35,6 +35,7 @@ namespace swift {
     std::string ABIDescriptorPath;
     bool emptyABIDescriptor = false;
     llvm::VersionTuple UserModuleVersion;
+    std::set<std::string> AllowableClients;
     std::string SDKName;
 
     StringRef GroupInfoPath;

include/swift/Serialization/Validation.h

@@ -93,6 +93,7 @@ struct ValidationInfo {
   StringRef sdkName = {};
   size_t bytes = 0;
   Status status = Status::Malformed;
+  std::vector<StringRef> allowableClients;
 };
 
 /// A collection of options that can be used to set up a new AST context

lib/Frontend/ArgsToFrontendOptionsConverter.cpp

@@ -120,6 +120,10 @@ bool ArgsToFrontendOptionsConverter::convert(
     }
   }
 
+  for (auto A : Args.getAllArgValues(options::OPT_allowable_client)) {
+    Opts.AllowableClients.insert(StringRef(A).str());
+  }
+
   Opts.DisableImplicitModules |= Args.hasArg(OPT_disable_implicit_swift_modules);
 
   Opts.ImportPrescan |= Args.hasArg(OPT_import_prescan);

lib/Frontend/Frontend.cpp

@@ -154,6 +154,7 @@ SerializationOptions CompilerInvocation::computeSerializationOptions(
     serializationOpts.ImportedHeader = opts.ImplicitObjCHeaderPath;
   serializationOpts.ModuleLinkName = opts.ModuleLinkName;
   serializationOpts.UserModuleVersion = opts.UserModuleVersion;
+  serializationOpts.AllowableClients = opts.AllowableClients;
 
   serializationOpts.PublicDependentLibraries =
       getIRGenOptions().PublicLinkLibraries;

lib/Frontend/ModuleInterfaceBuilder.cpp

@@ -266,6 +266,7 @@ std::error_code ExplicitModuleInterfaceBuilder::buildSwiftModuleFromInterface(
   SerializationOpts.AutolinkForceLoad =
       !Invocation.getIRGenOptions().ForceLoadSymbolName.empty();
   SerializationOpts.UserModuleVersion = FEOpts.UserModuleVersion;
+  SerializationOpts.AllowableClients = FEOpts.AllowableClients;
 
   // Record any non-SDK module interface files for the debug info.
   StringRef SDKPath = Instance.getASTContext().SearchPathOpts.getSDKPath();

lib/Serialization/ModuleFile.h

@@ -480,6 +480,10 @@ class ModuleFile
     return Core->UserModuleVersion;
   }
 
+  ArrayRef<StringRef> getAllowableClientNames() const {
+    return Core->AllowableClientNames;
+  }
+
   /// The Swift compatibility version in use when this module was built.
   const version::Version &getCompatibilityVersion() const {
     return Core->CompatibilityVersion;

lib/Serialization/ModuleFileSharedCore.cpp

@@ -310,6 +310,9 @@ static ValidationInfo validateControlBlock(
     case control_block::TARGET:
       result.targetTriple = blobData;
       break;
+    case control_block::ALLOWABLE_CLIENT_NAME:
+      result.allowableClients.push_back(blobData);
+      break;
     case control_block::SDK_NAME: {
       result.sdkName = blobData;
 
@@ -1320,6 +1323,7 @@ ModuleFileSharedCore::ModuleFileSharedCore(
       SDKName = info.sdkName;
       CompatibilityVersion = info.compatibilityVersion;
       UserModuleVersion = info.userModuleVersion;
+      AllowableClientNames = info.allowableClients;
       Bits.ArePrivateImportsEnabled = extInfo.arePrivateImportsEnabled();
       Bits.IsSIB = extInfo.isSIB();
       Bits.IsStaticLibrary = extInfo.isStaticLibrary();

lib/Serialization/ModuleFileSharedCore.h

@@ -88,6 +88,9 @@ class ModuleFileSharedCore {
   /// \c true if this module was compiled with -enable-ossa-modules.
   bool RequiresOSSAModules;
 
+  /// An array of module names that are allowed to import this one.
+  ArrayRef<StringRef> AllowableClientNames;
+
 public:
   /// Represents another module that has been imported as a dependency.
   class Dependency {