Revert "[Sema] Fix leak of implementation-only imported types in SPI signatures"

lib/Sema/TypeCheckAccess.cpp

@@ -1483,14 +1483,11 @@ class UsableFromInlineChecker : public AccessControlCheckerBase,
   }
 };
 
-// Diagnose public APIs exposing types that are either imported as
-// implementation-only or declared as SPI.
 class ExportabilityChecker : public DeclVisitor<ExportabilityChecker> {
   class Diagnoser;
 
   void checkTypeImpl(
       Type type, const TypeRepr *typeRepr, const SourceFile &SF,
-      const Decl *context,
       const Diagnoser &diagnoser) {
     // Don't bother checking errors.
     if (type && type->hasError())
@@ -1503,15 +1500,14 @@ class ExportabilityChecker : public DeclVisitor<ExportabilityChecker> {
     if (typeRepr) {
       const_cast<TypeRepr *>(typeRepr)->walk(TypeReprIdentFinder(
           [&](const ComponentIdentTypeRepr *component) {
-        TypeDecl *typeDecl = component->getBoundDecl();
-        ModuleDecl *M = typeDecl->getModuleContext();
-        bool isImplementationOnly = SF.isImportedImplementationOnly(M);
-        if (isImplementationOnly ||
-            (SF.isImportedAsSPI(typeDecl) && !context->isSPI())) {
-          diagnoser.diagnoseType(typeDecl, component, isImplementationOnly);
-          foundAnyIssues = true;
-        }
-
+        ModuleDecl *M = component->getBoundDecl()->getModuleContext();
+        if (!SF.isImportedImplementationOnly(M) &&
+            !SF.isImportedAsSPI(component->getBoundDecl()))
+          return true;
+
+        diagnoser.diagnoseType(component->getBoundDecl(), component,
+                               SF.isImportedImplementationOnly(M));
+        foundAnyIssues = true;
         // We still continue even in the diagnostic case to report multiple
         // violations.
         return true;
@@ -1529,19 +1525,19 @@ class ExportabilityChecker : public DeclVisitor<ExportabilityChecker> {
 
     class ProblematicTypeFinder : public TypeDeclFinder {
       const SourceFile &SF;
-      const Decl *context;
       const Diagnoser &diagnoser;
     public:
-      ProblematicTypeFinder(const SourceFile &SF, const Decl *context, const Diagnoser &diagnoser)
-        : SF(SF), context(context), diagnoser(diagnoser) {}
+      ProblematicTypeFinder(const SourceFile &SF, const Diagnoser &diagnoser)
+        : SF(SF), diagnoser(diagnoser) {}
 
       void visitTypeDecl(const TypeDecl *typeDecl) {
         ModuleDecl *M = typeDecl->getModuleContext();
-        bool isImplementationOnly = SF.isImportedImplementationOnly(M);
-        if (isImplementationOnly ||
-            (SF.isImportedAsSPI(typeDecl) && !context->isSPI()))
-          diagnoser.diagnoseType(typeDecl, /*typeRepr*/nullptr,
-                                 isImplementationOnly);
+        if (!SF.isImportedImplementationOnly(M) &&
+            !SF.isImportedAsSPI(typeDecl))
+          return;
+
+        diagnoser.diagnoseType(typeDecl, /*typeRepr*/nullptr,
+                               SF.isImportedImplementationOnly(M));
       }
 
       void visitSubstitutionMap(SubstitutionMap subs) {
@@ -1601,15 +1597,15 @@ class ExportabilityChecker : public DeclVisitor<ExportabilityChecker> {
       }
     };
 
-    type.walk(ProblematicTypeFinder(SF, context, diagnoser));
+    type.walk(ProblematicTypeFinder(SF, diagnoser));
   }
 
   void checkType(
       Type type, const TypeRepr *typeRepr, const Decl *context,
       const Diagnoser &diagnoser) {
     auto *SF = context->getDeclContext()->getParentSourceFile();
     assert(SF && "checking a non-source declaration?");
-    return checkTypeImpl(type, typeRepr, *SF, context, diagnoser);
+    return checkTypeImpl(type, typeRepr, *SF, diagnoser);
   }
 
   void checkType(
@@ -1706,7 +1702,7 @@ class ExportabilityChecker : public DeclVisitor<ExportabilityChecker> {
     AccessScope accessScope =
         VD->getFormalAccessScope(nullptr,
                                  /*treatUsableFromInlineAsPublic*/true);
-    if (accessScope.isPublic())
+    if (accessScope.isPublic() && !accessScope.isSPI())
       return false;
 
     // Is this a stored property in a non-resilient struct or class?