Merge remote-tracking branch 'origin/master' into master-rebranch

Author: swift-ci

include/swift/Frontend/ModuleInterfaceLoader.h

@@ -148,9 +148,8 @@ class ModuleInterfaceLoader : public SerializedModuleLoaderBase {
   ArrayRef<std::string> PreferInterfaceForModules;
 
   std::error_code findModuleFilesInDirectory(
-    AccessPathElem ModuleID, StringRef DirPath, StringRef ModuleFilename,
-    StringRef ModuleDocFilename,
-    StringRef ModuleSourceInfoFilename,
+    AccessPathElem ModuleID,
+    const SerializedModuleBaseName &BaseName,
     SmallVectorImpl<char> *ModuleInterfacePath,
     std::unique_ptr<llvm::MemoryBuffer> *ModuleBuffer,
     std::unique_ptr<llvm::MemoryBuffer> *ModuleDocBuffer,

include/swift/Serialization/SerializedModuleLoader.h

@@ -20,6 +20,9 @@
 
 namespace swift {
 class ModuleFile;
+namespace file_types {
+  enum ID : uint8_t;
+}
 
 /// Spceifies how to load modules when both a module interface and serialized
 /// AST are present, or whether to disallow one format or the other altogether.
@@ -30,6 +33,24 @@ enum class ModuleLoadingMode {
   OnlySerialized
 };
 
+/// Helper type used to pass and compute the sets of related filenames used by
+/// \c SerializedModuleLoader subclasses.
+struct SerializedModuleBaseName {
+  /// The base filename, wtihout any extension.
+  SmallString<256> baseName;
+
+  /// Creates a \c SerializedModuleBaseName.
+  SerializedModuleBaseName(StringRef baseName) : baseName(baseName) { }
+
+  /// Creates a \c SerializedModuleBaseName by contextualizing an existing one
+  /// with a \c parentDir.
+  SerializedModuleBaseName(StringRef parentDir,
+                           const SerializedModuleBaseName &name);
+
+  /// Gets the filename with a particular extension appended to it.
+  std::string getName(file_types::ID fileTy) const;
+};
+
 /// Common functionality shared between \c SerializedModuleLoader,
 /// \c ModuleInterfaceLoader and \c MemoryBufferSerializedModuleLoader.
 class SerializedModuleLoaderBase : public ModuleLoader {
@@ -71,43 +92,40 @@ class SerializedModuleLoaderBase : public ModuleLoader {
   ///   modules and will defer to the remaining module loaders to look up this
   ///   module.
   virtual std::error_code findModuleFilesInDirectory(
-      AccessPathElem ModuleID, StringRef DirPath, StringRef ModuleFilename,
-      StringRef ModuleDocFilename,
-      StringRef ModuleSourceInfoFilename,
+      AccessPathElem ModuleID,
+      const SerializedModuleBaseName &BaseName,
       SmallVectorImpl<char> *ModuleInterfacePath,
       std::unique_ptr<llvm::MemoryBuffer> *ModuleBuffer,
       std::unique_ptr<llvm::MemoryBuffer> *ModuleDocBuffer,
       std::unique_ptr<llvm::MemoryBuffer> *ModuleSourceInfoBuffer) = 0;
 
   std::error_code
-  openModuleFiles(AccessPathElem ModuleID,
-                  StringRef ModulePath, StringRef ModuleDocPath,
-                  StringRef ModuleSourceInfoName,
-                  std::unique_ptr<llvm::MemoryBuffer> *ModuleBuffer,
-                  std::unique_ptr<llvm::MemoryBuffer> *ModuleDocBuffer,
-                  std::unique_ptr<llvm::MemoryBuffer> *ModuleSourceInfoBuffer);
+  openModuleFile(
+       AccessPathElem ModuleID,
+       const SerializedModuleBaseName &BaseName,
+       std::unique_ptr<llvm::MemoryBuffer> *ModuleBuffer);
 
   std::error_code
-  openModuleDocFile(AccessPathElem ModuleID,
-                    StringRef ModuleDocPath,
-                    std::unique_ptr<llvm::MemoryBuffer> *ModuleDocBuffer);
+  openModuleDocFileIfPresent(
+      AccessPathElem ModuleID,
+      const SerializedModuleBaseName &BaseName,
+      std::unique_ptr<llvm::MemoryBuffer> *ModuleDocBuffer);
 
-  void
+  std::error_code
   openModuleSourceInfoFileIfPresent(
       AccessPathElem ModuleID,
-      StringRef ModulePath,
-      StringRef ModuleSourceInfoFileName,
+      const SerializedModuleBaseName &BaseName,
       std::unique_ptr<llvm::MemoryBuffer> *ModuleSourceInfoBuffer);
 
   /// If the module loader subclass knows that all options have been tried for
   /// loading an architecture-specific file out of a swiftmodule bundle, try
   /// to list the architectures that \e are present.
   ///
   /// \returns true if an error diagnostic was emitted
-  virtual bool maybeDiagnoseTargetMismatch(SourceLoc sourceLocation,
-                                           StringRef moduleName,
-                                           StringRef archName,
-                                           StringRef directoryPath) {
+  virtual bool maybeDiagnoseTargetMismatch(
+      SourceLoc sourceLocation,
+      StringRef moduleName,
+      const SerializedModuleBaseName &BaseName) {
     return false;
   }
 
@@ -178,18 +196,17 @@ class SerializedModuleLoader : public SerializedModuleLoaderBase {
   {}
 
   std::error_code findModuleFilesInDirectory(
-      AccessPathElem ModuleID, StringRef DirPath, StringRef ModuleFilename,
-      StringRef ModuleDocFilename,
-      StringRef ModuleSourceInfoFilename,
+      AccessPathElem ModuleID,
+      const SerializedModuleBaseName &BaseName,
       SmallVectorImpl<char> *ModuleInterfacePath,
       std::unique_ptr<llvm::MemoryBuffer> *ModuleBuffer,
       std::unique_ptr<llvm::MemoryBuffer> *ModuleDocBuffer,
       std::unique_ptr<llvm::MemoryBuffer> *ModuleSourceInfoBuffer) override;
 
-  bool maybeDiagnoseTargetMismatch(SourceLoc sourceLocation,
-                                   StringRef moduleName,
-                                   StringRef archName,
-                                   StringRef directoryPath) override;
+  bool maybeDiagnoseTargetMismatch(
+      SourceLoc sourceLocation,
+      StringRef moduleName,
+      const SerializedModuleBaseName &BaseName) override;
 
 public:
   virtual ~SerializedModuleLoader();
@@ -224,18 +241,17 @@ class MemoryBufferSerializedModuleLoader : public SerializedModuleLoaderBase {
                                    IgnoreSwiftSourceInfo) {}
 
   std::error_code findModuleFilesInDirectory(
-      AccessPathElem ModuleID, StringRef DirPath, StringRef ModuleFilename,
-      StringRef ModuleDocFilename,
-      StringRef ModuleSourceInfoFilename,
+      AccessPathElem ModuleID,
+      const SerializedModuleBaseName &BaseName,
       SmallVectorImpl<char> *ModuleInterfacePath,
       std::unique_ptr<llvm::MemoryBuffer> *ModuleBuffer,
       std::unique_ptr<llvm::MemoryBuffer> *ModuleDocBuffer,
       std::unique_ptr<llvm::MemoryBuffer> *ModuleSourceInfoBuffer) override;
 
-  bool maybeDiagnoseTargetMismatch(SourceLoc sourceLocation,
-                                   StringRef moduleName,
-                                   StringRef archName,
-                                   StringRef directoryPath) override;
+  bool maybeDiagnoseTargetMismatch(
+      SourceLoc sourceLocation,
+      StringRef moduleName,
+      const SerializedModuleBaseName &BaseName) override;
 
 public:
   virtual ~MemoryBufferSerializedModuleLoader();

lib/Frontend/ModuleInterfaceLoader.cpp

@@ -987,9 +987,8 @@ bool ModuleInterfaceLoader::isCached(StringRef DepPath) {
 /// cache or by converting it in a subordinate \c CompilerInstance, caching
 /// the results.
 std::error_code ModuleInterfaceLoader::findModuleFilesInDirectory(
-  AccessPathElem ModuleID, StringRef DirPath, StringRef ModuleFilename,
-  StringRef ModuleDocFilename,
-  StringRef ModuleSourceInfoFilename,
+  AccessPathElem ModuleID,
+  const SerializedModuleBaseName &BaseName,
   SmallVectorImpl<char> *ModuleInterfacePath,
   std::unique_ptr<llvm::MemoryBuffer> *ModuleBuffer,
   std::unique_ptr<llvm::MemoryBuffer> *ModuleDocBuffer,
@@ -999,16 +998,12 @@ std::error_code ModuleInterfaceLoader::findModuleFilesInDirectory(
   // should not have been constructed at all.
   assert(LoadMode != ModuleLoadingMode::OnlySerialized);
 
-  auto &fs = *Ctx.SourceMgr.getFileSystem();
-  llvm::SmallString<256> ModPath, InPath;
+  llvm::SmallString<256>
+  ModPath{ BaseName.getName(file_types::TY_SwiftModuleFile) },
+  InPath{  BaseName.getName(file_types::TY_SwiftModuleInterfaceFile) };
 
   // First check to see if the .swiftinterface exists at all. Bail if not.
-  ModPath = DirPath;
-  path::append(ModPath, ModuleFilename);
-
-  auto Ext = file_types::getExtension(file_types::TY_SwiftModuleInterfaceFile);
-  InPath = ModPath;
-  path::replace_extension(InPath, Ext);
+  auto &fs = *Ctx.SourceMgr.getFileSystem();
   if (!fs.exists(InPath)) {
     if (fs.exists(ModPath)) {
       LLVM_DEBUG(llvm::dbgs()
@@ -1040,18 +1035,16 @@ std::error_code ModuleInterfaceLoader::findModuleFilesInDirectory(
     if (ModuleInterfacePath)
       *ModuleInterfacePath = InPath;
   }
+
   // Open .swiftsourceinfo file if it's present.
-  SerializedModuleLoaderBase::openModuleSourceInfoFileIfPresent(ModuleID,
-                                                                ModPath,
-                                                       ModuleSourceInfoFilename,
-                                                       ModuleSourceInfoBuffer);
+  if (auto SourceInfoError = openModuleSourceInfoFileIfPresent(ModuleID,
+                                                               BaseName,
+                                                       ModuleSourceInfoBuffer))
+    return SourceInfoError;
+
   // Delegate back to the serialized module loader to load the module doc.
-  llvm::SmallString<256> DocPath{DirPath};
-  path::append(DocPath, ModuleDocFilename);
-  auto DocLoadErr =
-    SerializedModuleLoaderBase::openModuleDocFile(ModuleID, DocPath,
-                                                  ModuleDocBuffer);
-  if (DocLoadErr)
+  if (auto DocLoadErr = openModuleDocFileIfPresent(ModuleID, BaseName,
+                                                   ModuleDocBuffer))
     return DocLoadErr;
 
   return std::error_code();