Merge pull request #39586 from xymus/objc-spi-transitive

[Sema] Consider Objective-C SPIs as always imported in `isImportedAsSPI`

Author: xymus

include/swift/AST/Module.h

@@ -642,11 +642,11 @@ class ModuleDecl
                          const ModuleDecl *importedModule,
                          llvm::SmallSetVector<Identifier, 4> &spiGroups) const;
 
-  // Is \p attr accessible as an explictly imported SPI from this module?
+  // Is \p attr accessible as an explicitly imported SPI from this module?
   bool isImportedAsSPI(const SpecializeAttr *attr,
                        const ValueDecl *targetDecl) const;
 
-  // Is \p spiGroup accessible as an explictly imported SPI from this module?
+  // Is \p spiGroup accessible as an explicitly imported SPI from this module?
   bool isImportedAsSPI(Identifier spiGroup, const ModuleDecl *fromModule) const;
 
   /// \sa getImportedModules

lib/AST/Module.cpp

@@ -2389,11 +2389,16 @@ void SourceFile::lookupImportedSPIGroups(
 bool SourceFile::isImportedAsSPI(const ValueDecl *targetDecl) const {
   auto targetModule = targetDecl->getModuleContext();
   llvm::SmallSetVector<Identifier, 4> importedSPIGroups;
+
+  // Objective-C SPIs are always imported implicitly.
+  if (targetDecl->hasClangNode())
+    return !targetDecl->getSPIGroups().empty();
+
   lookupImportedSPIGroups(targetModule, importedSPIGroups);
-  if (importedSPIGroups.empty()) return false;
+  if (importedSPIGroups.empty())
+    return false;
 
   auto declSPIGroups = targetDecl->getSPIGroups();
-
   for (auto declSPI : declSPIGroups)
     if (importedSPIGroups.count(declSPI))
       return true;

test/ClangImporter/Inputs/frameworks/SPIContainerImporter.framework/Headers/SPIContainerImporter.h

@@ -0,0 +1 @@
+#import <SPIContainer/SPIContainer.h>

test/ClangImporter/Inputs/frameworks/SPIContainerImporter.framework/Modules/module.modulemap

@@ -0,0 +1,7 @@
+framework module SPIContainerImporter {
+  umbrella header "SPIContainerImporter.h"
+  export *
+  module * {
+    export *
+  }
+}

test/ClangImporter/availability_spi_transitive.swift

@@ -0,0 +1,8 @@
+// REQUIRES: OS=macosx
+// RUN: %target-swift-frontend -typecheck %s -F %S/Inputs/frameworks -enable-clang-spi -verify
+
+import SPIContainerImporter
+
+@_spi(a) public let a: SPIInterface1
+
+public let c: SPIInterface1 // expected-error{{cannot use class 'SPIInterface1' here; it is an SPI imported from 'SPIContainer'}}