Merge pull request #69480 from nkcsgexi/blocklistsupportforusingtextualinterface

ModuleInterface: allow blocklist to configure module names from SDKs that we use textual interfaces exclusively

Author: nkcsgexi

include/swift/AST/DiagnosticsFrontend.def

@@ -440,7 +440,8 @@ NOTE(compiled_module_ignored_reason,none,
      "compiled module '%0' was ignored because %select{%error"
      "|it belongs to a framework in the SDK"
      "|loading from module interfaces is preferred"
-     "|it's a compiler host module}1",
+     "|it's a compiler host module"
+     "|the module name is blocklisted}1",
      (StringRef, unsigned))
 NOTE(out_of_date_module_here,none,
      "%select{compiled|cached|forwarding|prebuilt}0 module is out of date: '%1'",

lib/Frontend/ModuleInterfaceLoader.cpp

@@ -236,6 +236,7 @@ struct ModuleRebuildInfo {
     PublicFramework,
     InterfacePreferred,
     CompilerHostModule,
+    Blocklisted,
   };
   struct CandidateModule {
     std::string path;
@@ -758,6 +759,14 @@ class ModuleInterfaceLoaderImpl {
     // Should we attempt to load a swiftmodule adjacent to the swiftinterface?
     bool shouldLoadAdjacentModule = !ctx.IgnoreAdjacentModules;
 
+    if (modulePath.contains(".sdk")) {
+      if (ctx.blockListConfig.hasBlockListAction(moduleName,
+          BlockListKeyKind::ModuleName, BlockListAction::ShouldUseTextualModule)) {
+        shouldLoadAdjacentModule = false;
+        rebuildInfo.addIgnoredModule(modulePath, ReasonIgnored::Blocklisted);
+      }
+    }
+
     // Don't use the adjacent swiftmodule for frameworks from the public
     // Frameworks folder of the SDK.
     if (isInSystemFrameworks(modulePath, /*publicFramework*/true)) {

test/ModuleInterface/block_list_textual_interface.swift

@@ -0,0 +1,35 @@
+// REQUIRES: objc_interop
+// RUN: %empty-directory(%t)
+// RUN: %empty-directory(%t.sdk)
+// RUN: %empty-directory(%t/modulecache)
+// RUN: %target-swift-frontend -emit-module -o %t.sdk/Foo.swiftmodule -emit-module-interface-path %t.sdk/Foo.swiftinterface -module-name Foo  %s -D FOO -enable-library-evolution
+// RUN: %target-swift-frontend -emit-module -o %t.sdk/Bar.swiftmodule -emit-module-interface-path %t.sdk/Bar.swiftinterface -module-name Bar  %s -D BAR -enable-library-evolution -I %t.sdk
+
+#if FOO
+
+public func fooFunc() {}
+
+#elseif BAR
+
+import Foo
+public func barFunc() { fooFunc() }
+
+#elseif BAZ
+
+import Bar
+public func bazFunc() { barFunc() }
+
+#endif
+
+
+// RUN: echo "---" > %t/blocklist.yml
+// RUN: echo "DowngradeInterfaceVerificationFailure:" >> %t/blocklist.yml
+// RUN: echo "  ModuleName:" >> %t/blocklist.yml
+// RUN: echo "    - TestBlocklistedModule # For tests" >> %t/blocklist.yml
+// RUN: echo "ShouldUseTextualModule:" >> %t/blocklist.yml
+// RUN: echo "  ModuleName:" >> %t/blocklist.yml
+// RUN: echo "    - Foo # for tests" >> %t/blocklist.yml
+
+// RUN: %target-swift-frontend -typecheck %s -D BAZ -I %t.sdk -blocklist-file %t/blocklist.yml -module-cache-path %t/modulecache -Rmodule-interface-rebuild &> %t/notes.txt
+// RUN: %FileCheck -check-prefix CHECK-NOTES --input-file %t/notes.txt %s
+// CHECK-NOTES: Foo.swiftmodule' was ignored because the module name is blocklisted