[Sema] Clean up lookupImportedSPIGroups

Author: xymus

lib/AST/Module.cpp

@@ -2852,8 +2852,7 @@ void SourceFile::lookupImportedSPIGroups(
   for (auto &import : *Imports) {
     if (import.options.contains(ImportFlags::SPIAccessControl) &&
         importedModule == import.module.importedModule) {
-      auto importedSpis = import.spiGroups;
-      spiGroups.insert(importedSpis.begin(), importedSpis.end());
+      spiGroups.insert(import.spiGroups.begin(), import.spiGroups.end());
     }
   }
 }

lib/Serialization/ModuleFile.cpp

@@ -889,18 +889,6 @@ void ModuleFile::lookupObjCMethods(
   }
 }
 
-void ModuleFile::lookupImportedSPIGroups(
-                        const ModuleDecl *importedModule,
-                        llvm::SmallSetVector<Identifier, 4> &spiGroups) const {
-  for (auto &dep : Dependencies) {
-    auto depSpis = dep.spiGroups;
-    if (dep.Import.hasValue() && dep.Import->importedModule == importedModule &&
-        !depSpis.empty()) {
-      spiGroups.insert(depSpis.begin(), depSpis.end());
-    }
-  }
-}
-
 void
 ModuleFile::collectLinkLibraries(ModuleDecl::LinkLibraryCallback callback) const {
   for (const auto &lib : Core->LinkLibraries)

lib/Serialization/ModuleFile.h

@@ -670,12 +670,6 @@ class ModuleFile
          ObjCSelector selector,
          SmallVectorImpl<AbstractFunctionDecl *> &results);
 
-  /// Find all SPI names imported from \p importedModule by this module,
-  /// collecting the identifiers in \p spiGroups.
-  void lookupImportedSPIGroups(
-                         const ModuleDecl *importedModule,
-                         llvm::SmallSetVector<Identifier, 4> &spiGroups) const;
-
   /// Reports all link-time dependencies.
   void collectLinkLibraries(ModuleDecl::LinkLibraryCallback callback) const;
 

lib/Serialization/SerializedModuleLoader.cpp

@@ -15,6 +15,7 @@
 #include "ModuleFileSharedCore.h"
 #include "swift/AST/ASTContext.h"
 #include "swift/AST/DiagnosticsSema.h"
+#include "swift/AST/ImportCache.h"
 #include "swift/AST/ModuleDependencies.h"
 #include "swift/Basic/Defer.h"
 #include "swift/Basic/FileTypes.h"
@@ -1486,7 +1487,15 @@ SerializedASTFile::loadFingerprint(const IterableDeclContext *IDC) const {
 void SerializedASTFile::lookupImportedSPIGroups(
                         const ModuleDecl *importedModule,
                         llvm::SmallSetVector<Identifier, 4> &spiGroups) const {
-  File.lookupImportedSPIGroups(importedModule, spiGroups);
+  auto M = getParentModule();
+  for (auto &dep : File.Dependencies) {
+    if (!dep.Import.hasValue())
+      continue;
+
+    if (dep.Import->importedModule == importedModule) {
+      spiGroups.insert(dep.spiGroups.begin(), dep.spiGroups.end());
+    }
+  }
 }
 
 Optional<CommentInfo>