Merge pull request #39198 from nkcsgexi/retry-abi

ClangImporter: import SPIs from bridging headers by default

Author: nkcsgexi

lib/Sema/ImportResolution.cpp

@@ -492,13 +492,17 @@ ModuleImplicitImportsRequest::evaluate(Evaluator &evaluator,
   auto *clangImporter =
       static_cast<ClangImporter *>(ctx.getClangModuleLoader());
 
+  SmallVector<Identifier, 4> clangSpiGroups;
+  clangSpiGroups.push_back(ctx.getIdentifier(CLANG_MODULE_DEFUALT_SPI_GROUP_NAME));
   // Implicitly import the bridging header module if needed.
   auto bridgingHeaderPath = importInfo.BridgingHeaderPath;
   if (!bridgingHeaderPath.empty() &&
       !clangImporter->importBridgingHeader(bridgingHeaderPath, module)) {
     auto *headerModule = clangImporter->getImportedHeaderModule();
     assert(headerModule && "Didn't load bridging header?");
     imports.emplace_back(ImportedModule(headerModule), ImportFlags::Exported);
+    imports.back().options |= ImportFlags::SPIAccessControl;
+    imports.back().spiGroups = ctx.AllocateCopy(clangSpiGroups);
   }
 
   // Implicitly import the underlying Clang half of this module if needed.
@@ -509,6 +513,8 @@ ModuleImplicitImportsRequest::evaluate(Evaluator &evaluator,
     unloadedImports.emplace_back(UnloadedImportedModule(importPath.copyTo(ctx),
                                                         /*isScoped=*/false),
                                  ImportFlags::Exported);
+    imports.back().options |= ImportFlags::SPIAccessControl;
+    imports.back().spiGroups = ctx.AllocateCopy(clangSpiGroups);
   }
 
   return { ctx.AllocateCopy(imports), ctx.AllocateCopy(unloadedImports) };

test/ClangImporter/availability_spi_as_unavailable_bridging_header.swift

@@ -0,0 +1,14 @@
+// REQUIRES: OS=macosx
+// RUN: %target-swift-frontend -typecheck %s -import-objc-header %S/Inputs/frameworks/SPIContainer.framework/Headers/SPIContainer.h -verify
+
+
+@_spi(a) public let a: SPIInterface1
+@_spi(a) public let b: SPIInterface2
+
+public let c: SPIInterface1 // expected-error{{cannot use class 'SPIInterface1' here; it is an SPI imported from '__ObjC'}}
+public let d: SPIInterface2 // expected-error{{cannot use class 'SPIInterface2' here; it is an SPI imported from '__ObjC'}}
+
+@inlinable
+public func inlinableUsingSPI() {
+  SharedInterface.foo() // expected-error{{class method 'foo()' cannot be used in an '@inlinable' function because it is an SPI imported from '__ObjC'}}
+}