Print proper error message when the swiftmodule for architecture not found

include/swift/AST/DiagnosticsSema.def

@@ -562,6 +562,9 @@ ERROR(cannot_return_value_from_void_func,none,
 
 ERROR(sema_no_import,Fatal,
       "no such module '%0'", (StringRef))
+ERROR(sema_no_import_arch,Fatal,
+      "could not find module '%0' for architecture '%1'; "
+      "found: %2", (StringRef, StringRef, StringRef))
 ERROR(sema_no_import_repl,none,
       "no such module '%0'", (StringRef))
 NOTE(sema_no_import_no_sdk,none,

lib/Serialization/SerializedModuleLoader.cpp

@@ -81,12 +81,48 @@ openModuleFiles(StringRef DirName, StringRef ModuleFilename,
   return std::error_code();
 }
 
+static void addDiagnosticInfoForArchitectureMismatch(ASTContext &ctx,
+                                                     SourceLoc sourceLocation,
+                                                     StringRef moduleName,
+                                                     StringRef archName,
+                                                     StringRef directoryPath) {
+
+  std::error_code errorCode;
+  llvm::sys::fs::directory_iterator directoryIterator(directoryPath, errorCode,
+                                                      true);
+  llvm::sys::fs::directory_iterator endIterator;
+
+  if (errorCode) {
+    return;
+  }
+
+  std::string foundArchs;
+  for (; directoryIterator != endIterator;
+       directoryIterator.increment(errorCode)) {
+    if (errorCode) {
+      return;
+    }
+    auto entry = *directoryIterator;
+    StringRef filePath(entry.path());
+    StringRef extension = llvm::sys::path::extension(filePath);
+    if (extension.startswith(".") &&
+        extension.drop_front() == SERIALIZED_MODULE_EXTENSION) {
+      foundArchs = foundArchs + (foundArchs.length() > 0 ? ", " : "") +
+                   llvm::sys::path::stem(filePath).str();
+    }
+  }
+
+  ctx.Diags.diagnose(sourceLocation, diag::sema_no_import_arch, moduleName,
+                     archName, foundArchs);
+}
+
 static bool
 findModule(ASTContext &ctx, AccessPathElem moduleID,
            std::unique_ptr<llvm::MemoryBuffer> *moduleBuffer,
            std::unique_ptr<llvm::MemoryBuffer> *moduleDocBuffer,
            bool &isFramework) {
-  llvm::SmallString<64> moduleFilename(moduleID.first.str());
+  llvm::SmallString<64> moduleName(moduleID.first.str());
+  llvm::SmallString<64> moduleFilename(moduleName);
   moduleFilename += '.';
   moduleFilename += SERIALIZED_MODULE_EXTENSION;
 
@@ -96,9 +132,10 @@ findModule(ASTContext &ctx, AccessPathElem moduleID,
 
   // FIXME: Which name should we be using here? Do we care about CPU subtypes?
   // FIXME: At the very least, don't hardcode "arch".
-  llvm::SmallString<16> archFile{
+  llvm::SmallString<16> archName{
       ctx.LangOpts.getPlatformConditionValue(PlatformConditionKind::Arch)};
-  llvm::SmallString<16> archDocFile{archFile};
+  llvm::SmallString<16> archFile{archName};
+  llvm::SmallString<16> archDocFile{archName};
   if (!archFile.empty()) {
     archFile += '.';
     archFile += SERIALIZED_MODULE_EXTENSION;
@@ -122,6 +159,12 @@ findModule(ASTContext &ctx, AccessPathElem moduleID,
                             archFile.str(), archDocFile.str(),
                             moduleBuffer, moduleDocBuffer,
                             scratch);
+
+      if (err == std::errc::no_such_file_or_directory) {
+        addDiagnosticInfoForArchitectureMismatch(
+            ctx, moduleID.second, moduleName, archName, currPath);
+        return false;
+      }
     }
     if (!err)
       return true;
@@ -134,12 +177,22 @@ findModule(ASTContext &ctx, AccessPathElem moduleID,
 
     auto tryFrameworkImport = [&](StringRef frameworkPath) -> bool {
       currPath = frameworkPath;
-      llvm::sys::path::append(currPath, moduleFramework.str(),
-                              "Modules", moduleFilename.str());
-      auto err = openModuleFiles(currPath,
-                                 archFile.str(), archDocFile.str(),
-                                 moduleBuffer, moduleDocBuffer,
-                                 scratch);
+      llvm::sys::path::append(currPath, moduleFramework.str());
+      // Check if the framework directory exists
+      if (!llvm::sys::fs::is_directory(currPath)) {
+        return false;
+      }
+
+      llvm::sys::path::append(currPath, "Modules", moduleFilename.str());
+      auto err = openModuleFiles(currPath, archFile.str(), archDocFile.str(),
+                                 moduleBuffer, moduleDocBuffer, scratch);
+
+      if (err == std::errc::no_such_file_or_directory) {
+        addDiagnosticInfoForArchitectureMismatch(
+            ctx, moduleID.second, moduleName, archName, currPath);
+        return false;
+      }
+
       return !err;
     };
 
@@ -642,4 +695,4 @@ SerializedASTFile::getDiscriminatorForPrivateValue(const ValueDecl *D) const {
   Identifier discriminator = File.getDiscriminatorForPrivateValue(D);
   assert(!discriminator.empty() && "no discriminator found for value");
   return discriminator;
-}
+}

test/Serialization/load-invalid-arch.swift

@@ -0,0 +1,28 @@
+
+// RUN: %empty-directory(%t)
+// RUN: mkdir %t/new_module.swiftmodule
+// RUN: touch %t/new_module.swiftmodule/i387.swiftmodule
+// RUN: touch %t/new_module.swiftmodule/ppc65.swiftmodule
+// RUN: touch %t/new_module.swiftmodule/i387.swiftdoc
+// RUN: touch %t/new_module.swiftmodule/ppc65.swiftdoc
+// RUN: not %target-swift-frontend %s -typecheck -I %t -show-diagnostics-after-fatal 2>&1 | %FileCheck %s -DTARGET_ARCHITECTURE=%target-cpu
+
+// RUN: %empty-directory(%t)
+// RUN: mkdir -p %t/new_module.framework/Modules/new_module.swiftmodule/
+// RUN: touch %t/new_module.framework/Modules/new_module.swiftmodule/i387.swiftmodule
+// RUN: touch %t/new_module.framework/Modules/new_module.swiftmodule/ppc65.swiftmodule
+// RUN: not %target-swift-frontend %s -F %t -typecheck -show-diagnostics-after-fatal 2>&1 | %FileCheck %s -DTARGET_ARCHITECTURE=%target-cpu
+
+//CHECK: {{.*}} error: could not find module 'new_module' for architecture '[[TARGET_ARCHITECTURE]]'; found: {{ppc65, i387|i387, ppc65}}
+//CHECK-NEXT: import new_module
+//CHECK-NEXT: 		^
+//CHECK: error: no such module 'new_module'
+//CHECK-NEXT: import new_module
+//CHECK-NEXT: 		^
+//CHECK: error: use of unresolved identifier 'new_module'
+//CHECK-NEXT: new_module.foo()
+//CHECK-NEXT: ^~~~~~~~~~
+
+import new_module
+
+new_module.foo()