Merge pull request #80098 from xymus/upstream-swiftmodule-blocklist

Frontend: Upstream blocklist check when ignoring adjacent swiftmodule files

Author: xymus

lib/Frontend/ModuleInterfaceLoader.cpp

@@ -836,12 +836,20 @@ class ModuleInterfaceLoaderImpl {
 
       // Don't use the adjacent swiftmodule for frameworks from the public
       // Frameworks folder of the SDK.
-      if (isInSystemFrameworks(modulePath, /*publicFramework*/true) ||
-          isInSystemSubFrameworks(modulePath)) {
+      bool blocklistSwiftmodule =
+        ctx.blockListConfig.hasBlockListAction(moduleName,
+                                     BlockListKeyKind::ModuleName,
+                                     BlockListAction::ShouldUseBinaryModule);
+
+      if ((isInSystemFrameworks(modulePath, /*publicFramework*/true) ||
+           isInSystemSubFrameworks(modulePath)) &&
+          !blocklistSwiftmodule) {
         shouldLoadAdjacentModule = false;
         rebuildInfo.addIgnoredModule(modulePath,
                                      ReasonIgnored::PublicFramework);
-      } else if (isInSystemLibraries(modulePath) && moduleName != STDLIB_NAME) {
+      } else if (isInSystemLibraries(modulePath) &&
+                 moduleName != STDLIB_NAME &&
+                 !blocklistSwiftmodule) {
         shouldLoadAdjacentModule = false;
         rebuildInfo.addIgnoredModule(modulePath,
                                      ReasonIgnored::PublicLibrary);

test/ModuleInterface/prefer-swiftinterface-by-default.swift

@@ -78,8 +78,7 @@ import SDKModuleAtUnusualPath
 import HostResourceDirModule // expected-remark {{rebuilding module 'HostResourceDirModule' from interface}}
 // expected-note @-1 {{was ignored because it's a compiler host module}}
 import LocalModule
-import BlocklistedModule // expected-remark {{rebuilding module 'BlocklistedModule' from interface}}
-// expected-note @-1 {{was ignored because it belongs to a framework in the SDK}}
+import BlocklistedModule
 
 //--- blocklistDisabled.yml
 ---