[Sema] Track references to imports with ModuleDecls

Author: xymus

include/swift/AST/SourceFile.h

@@ -149,8 +149,7 @@ class SourceFile final : public FileUnit {
       PreconcurrencyImportsUsed;
 
   /// The highest access level of declarations referencing each import.
-  llvm::DenseMap<AttributedImport<ImportedModule>, AccessLevel>
-      ImportsUseAccessLevel;
+  llvm::DenseMap<const ModuleDecl *, AccessLevel> ImportsUseAccessLevel;
 
   /// A unique identifier representing this file; used to mark private decls
   /// within the file to keep them from conflicting with other files in the
@@ -418,7 +417,7 @@ class SourceFile final : public FileUnit {
   /// Return the highest access level of the declarations referencing
   /// this import in signature or inlinable code.
   AccessLevel
-  getMaxAccessLevelUsingImport(AttributedImport<ImportedModule> import) const;
+  getMaxAccessLevelUsingImport(const ModuleDecl *import) const;
 
   /// Register the use of \p import from an API with \p accessLevel.
   void registerAccessLevelUsingImport(AttributedImport<ImportedModule> import,

lib/AST/Module.cpp

@@ -3192,8 +3192,8 @@ void SourceFile::setImportUsedPreconcurrency(
 
 AccessLevel
 SourceFile::getMaxAccessLevelUsingImport(
-    AttributedImport<ImportedModule> import) const {
-  auto known = ImportsUseAccessLevel.find(import);
+    const ModuleDecl *mod) const {
+  auto known = ImportsUseAccessLevel.find(mod);
   if (known == ImportsUseAccessLevel.end())
     return AccessLevel::Internal;
   return known->second;
@@ -3202,11 +3202,12 @@ SourceFile::getMaxAccessLevelUsingImport(
 void SourceFile::registerAccessLevelUsingImport(
     AttributedImport<ImportedModule> import,
     AccessLevel accessLevel) {
-  auto known = ImportsUseAccessLevel.find(import);
+  auto mod = import.module.importedModule;
+  auto known = ImportsUseAccessLevel.find(mod);
   if (known == ImportsUseAccessLevel.end())
-    ImportsUseAccessLevel[import] = accessLevel;
+    ImportsUseAccessLevel[mod] = accessLevel;
   else
-    ImportsUseAccessLevel[import] = std::max(accessLevel, known->second);
+    ImportsUseAccessLevel[mod] = std::max(accessLevel, known->second);
 }
 
 bool HasImportsMatchingFlagRequest::evaluate(Evaluator &evaluator,

lib/Sema/TypeCheckAccess.cpp

@@ -2440,7 +2440,7 @@ void swift::diagnoseUnnecessaryPublicImports(SourceFile &SF) {
         import.accessLevel <= AccessLevel::Internal)
       continue;
 
-    AccessLevel levelUsed = SF.getMaxAccessLevelUsingImport(import);
+    AccessLevel levelUsed = SF.getMaxAccessLevelUsingImport(import.module.importedModule);
     if (import.accessLevel > levelUsed) {
       auto diagId = import.accessLevel == AccessLevel::Public ?
                                                   diag::remove_public_import :