Merge pull request swiftlang#35602 from xymus/spi-indirect-conformance

[ModuleInterface] Preserve SPI information for indirect conformances

Author: xymus

lib/Frontend/ModuleInterfaceSupport.cpp

@@ -452,6 +452,9 @@ class InheritedProtocolCollector {
             inherited->isSpecificProtocol(KnownProtocolKind::Actor))
           return TypeWalker::Action::Continue; 
 
+        if (inherited->isSPI() && !printOptions.PrintSPIs)
+          return TypeWalker::Action::Continue;
+
         if (isPublicOrUsableFromInline(inherited) &&
             conformanceDeclaredInModule(M, nominal, inherited)) {
           protocolsToPrint.push_back({inherited, protoAndAvailability.second});
@@ -466,17 +469,20 @@ class InheritedProtocolCollector {
 
     for (const auto &protoAndAvailability : protocolsToPrint) {
       StreamPrinter printer(out);
+      ProtocolDecl *proto = protoAndAvailability.first;
+
       // FIXME: Shouldn't this be an implicit conversion?
       TinyPtrVector<const DeclAttribute *> attrs;
       attrs.insert(attrs.end(), protoAndAvailability.second.begin(),
                    protoAndAvailability.second.end());
+      auto spiAttributes = proto->getAttrs().getAttributes<SPIAccessControlAttr>();
+      attrs.insert(attrs.end(), spiAttributes.begin(), spiAttributes.end());
       DeclAttributes::print(printer, printOptions, attrs);
 
       printer << "extension ";
       nominal->getDeclaredType().print(printer, printOptions);
       printer << " : ";
 
-      ProtocolDecl *proto = protoAndAvailability.first;
       proto->getDeclaredInterfaceType()->print(printer, printOptions);
 
       printer << " {}\n";

test/SPI/private_swiftinterface.swift

@@ -200,3 +200,11 @@ extension IOIPublicStruct : LocalPublicProto {}
 extension PublicType: SPIProto where T: PrivateConstraint {}
 // CHECK-PRIVATE: extension {{.*}}.PublicType : {{.*}}.SPIProto where T : _ConstraintThatIsNotPartOfTheAPIOfThisLibrary
 // CHECK-PUBLIC-NOT: _ConstraintThatIsNotPartOfTheAPIOfThisLibrary
+
+// Preserve SPI information when printing indirect conformances via
+// an internal protocol. rdar://73082943
+@_spi(S) public protocol SPIProtocol {}
+internal protocol InternalProtocol: SPIProtocol {}
+public struct PublicStruct2: InternalProtocol {}
+// CHECK-PRIVATE: @_spi(S) extension {{.*}}.PublicStruct2 : {{.*}}.SPIProtocol
+// CHECK-PUBLIC-NOT: SPIProtocol