Frontend: Ignore resilient binary swiftmodules under usr/lib/swift

Most SDKs use only swiftinterfaces under usr/lib/swift. Let's make sure
we standardize this behavior and use only swiftinterface when they are
present, even if there are also binary swiftmodule files available.

Apply the same logic to SubFrameworks as well while we're at it.

rdar://145316821

Author: xymus

include/swift/AST/DiagnosticsFrontend.def

@@ -440,6 +440,7 @@ NOTE(sdk_version_pbm_version,none,
 NOTE(compiled_module_ignored_reason,none,
      "compiled module '%0' was ignored because %select{%error"
      "|it belongs to a framework in the SDK"
+     "|it's a library module in the SDK"
      "|loading from module interfaces is preferred"
      "|it's a compiler host module"
      "|the module name is blocklisted,"

lib/Frontend/ModuleInterfaceLoader.cpp

@@ -237,6 +237,7 @@ struct ModuleRebuildInfo {
   enum class ReasonIgnored {
     NotIgnored,
     PublicFramework,
+    PublicLibrary,
     InterfacePreferred,
     CompilerHostModule,
     Blocklisted,
@@ -762,6 +763,28 @@ class ModuleInterfaceLoaderImpl {
     return pathStartsWith(frameworksPath, path);
   }
 
+  bool isInSystemSubFrameworks(StringRef path) {
+    StringRef sdkPath = ctx.SearchPathOpts.getSDKPath();
+    if (sdkPath.empty()) return false;
+
+    SmallString<128> frameworksPath;
+    llvm::sys::path::append(frameworksPath,
+                            sdkPath, "System", "Library", "SubFrameworks");
+
+    return pathStartsWith(frameworksPath, path);
+  }
+
+  bool isInSystemLibraries(StringRef path) {
+    StringRef sdkPath = ctx.SearchPathOpts.getSDKPath();
+    if (sdkPath.empty()) return false;
+
+    SmallString<128> frameworksPath;
+    llvm::sys::path::append(frameworksPath,
+                            sdkPath, "usr", "lib", "swift");
+
+    return pathStartsWith(frameworksPath, path);
+  }
+
   std::pair<std::string, std::string> getCompiledModuleCandidates() {
     using ReasonIgnored = ModuleRebuildInfo::ReasonIgnored;
     using ReasonModuleInterfaceIgnored =
@@ -813,10 +836,15 @@ class ModuleInterfaceLoaderImpl {
 
       // Don't use the adjacent swiftmodule for frameworks from the public
       // Frameworks folder of the SDK.
-      if (isInSystemFrameworks(modulePath, /*publicFramework*/true)) {
+      if (isInSystemFrameworks(modulePath, /*publicFramework*/true) ||
+          isInSystemSubFrameworks(modulePath)) {
         shouldLoadAdjacentModule = false;
         rebuildInfo.addIgnoredModule(modulePath,
                                      ReasonIgnored::PublicFramework);
+      } else if (isInSystemLibraries(modulePath) && moduleName != STDLIB_NAME) {
+        shouldLoadAdjacentModule = false;
+        rebuildInfo.addIgnoredModule(modulePath,
+                                     ReasonIgnored::PublicLibrary);
       } else if (isInResourceHostDir(modulePath)) {
         shouldLoadAdjacentModule = false;
         rebuildInfo.addIgnoredModule(modulePath,

test/ModuleInterface/ignore-adjacent-swiftmodules.swift

@@ -3,21 +3,40 @@
 // REQUIRES: VENDOR=apple
 
 /// Prepare the SDK.
+//// Public framework
 // RUN: cp -r %S/../Sema/Inputs/public-private-sdk %t/sdk
 // RUN: %target-swift-frontend -emit-module -module-name PublicSwift -enable-library-evolution -swift-version 5 \
 // RUN:   %t/sdk/System/Library/Frameworks/PublicSwift.framework/Modules/PublicSwift.swiftmodule/source.swift \
 // RUN:   -o %t/sdk/System/Library/Frameworks/PublicSwift.framework/Modules/PublicSwift.swiftmodule/%target-swiftmodule-name \
 // RUN:   -emit-module-interface-path %t/sdk/System/Library/Frameworks/PublicSwift.framework/Modules/PublicSwift.swiftmodule/%target-swiftinterface-name
 // RUN: %target-swift-typecheck-module-from-interface(%t/sdk/System/Library/Frameworks/PublicSwift.framework/Modules/PublicSwift.swiftmodule/%target-swiftinterface-name) -module-name PublicSwift
+
+//// Private framework
 // RUN: %target-swift-frontend -emit-module -module-name PrivateSwift -enable-library-evolution -swift-version 5 \
 // RUN:   %t/sdk/System/Library/PrivateFrameworks/PrivateSwift.framework/Modules/PrivateSwift.swiftmodule/source.swift \
 // RUN:   -o %t/sdk/System/Library/PrivateFrameworks/PrivateSwift.framework/Modules/PrivateSwift.swiftmodule/%target-swiftmodule-name \
 // RUN:   -emit-module-interface-path %t/sdk/System/Library/PrivateFrameworks/PrivateSwift.framework/Modules/PrivateSwift.swiftmodule/%target-swiftinterface-name
 // RUN: %target-swift-typecheck-module-from-interface(%t/sdk/System/Library/PrivateFrameworks/PrivateSwift.framework/Modules/PrivateSwift.swiftmodule/%target-swiftinterface-name) -module-name PrivateSwift
 
+//// Public library
+// RUN: %target-swift-frontend -emit-module -module-name PublicSwiftLibrary -enable-library-evolution -swift-version 5 \
+// RUN:   %t/sdk/usr/lib/swift/PublicSwiftLibrary.swiftmodule/source.swift \
+// RUN:   -o %t/sdk/usr/lib/swift/PublicSwiftLibrary.swiftmodule/%target-swiftmodule-name \
+// RUN:   -emit-module-interface-path %t/sdk/usr/lib/swift/PublicSwiftLibrary.swiftmodule/%target-swiftinterface-name
+// RUN: %target-swift-typecheck-module-from-interface(%t/sdk/usr/lib/swift/PublicSwiftLibrary.swiftmodule/%target-swiftinterface-name) -module-name PublicSwiftLibrary
+
+//// Public subframework
+// RUN: %target-swift-frontend -emit-module -module-name SubSwift -enable-library-evolution -swift-version 5 \
+// RUN:   %t/sdk/System/Library/SubFrameworks/SubSwift.framework/Modules/SubSwift.swiftmodule/source.swift \
+// RUN:   -o %t/sdk/System/Library/SubFrameworks/SubSwift.framework/Modules/SubSwift.swiftmodule/%target-swiftmodule-name \
+// RUN:   -emit-module-interface-path %t/sdk/System/Library/SubFrameworks/SubSwift.framework/Modules/SubSwift.swiftmodule/%target-swiftinterface-name
+// RUN: %target-swift-typecheck-module-from-interface(%t/sdk/System/Library/SubFrameworks/SubSwift.framework/Modules/SubSwift.swiftmodule/%target-swiftinterface-name) -module-name SubSwift
+
 /// Break the swiftmodules.
 // RUN: echo "This is a malformed swiftmodule" > %t/sdk/System/Library/Frameworks/PublicSwift.framework/Modules/PublicSwift.swiftmodule/%target-swiftmodule-name
 // RUN: echo "This is a malformed swiftmodule" > %t/sdk/System/Library/PrivateFrameworks/PrivateSwift.framework/Modules/PrivateSwift.swiftmodule/%target-swiftmodule-name
+// RUN: echo "This is a malformed swiftmodule" > %t/sdk/System/Library/SubFrameworks/SubSwift.framework/Modules/SubSwift.swiftmodule/%target-swiftmodule-name
+// RUN: echo "This is a malformed swiftmodule" > %t/sdk/usr/lib/swift/PublicSwiftLibrary.swiftmodule/%target-swiftmodule-name
 
 /// There should be no attempt at loading the malformed PublicSwift swiftmodule.
 /// This means no notes about:
@@ -36,3 +55,9 @@ import PrivateSwift
 // expected-remark @-1 {{rebuilding module 'PrivateSwift' from interface}}
 // expected-note @-2 {{compiled module is out of date}}
 // expected-note @-3 {{: malformed}}
+
+import PublicSwiftLibrary // expected-remark {{rebuilding module 'PublicSwiftLibrary' from interface}}
+// expected-note @-1 {{was ignored because it's a library module in the SDK}}
+
+import SubSwift // expected-remark {{rebuilding module 'SubSwift' from interface}}
+// expected-note @-1 {{was ignored because it belongs to a framework in the SDK}}

test/Sema/Inputs/public-private-sdk/System/Library/SubFrameworks/SubSwift.framework/Modules/SubSwift.swiftmodule/source.swift

@@ -0,0 +1 @@
+public func foo() {}

test/Sema/Inputs/public-private-sdk/usr/lib/swift/PublicSwiftLibrary.swiftmodule/source.swift

@@ -0,0 +1 @@
+public func foo() {}