[Sema] Pass ModuleDecl directly to notes on imports with access-levels

Author: xymus

include/swift/AST/DiagnosticsSema.def

@@ -2332,12 +2332,12 @@ ERROR(access_level_conflict_with_exported,none,
       (DeclAttribute, DeclAttribute))
 NOTE(module_imported_here,none,
      "module %0 imported as '%select{private|fileprivate|internal|package|%ERROR|%ERROR}1' here",
-     (Identifier, AccessLevel))
+     (const ModuleDecl*, AccessLevel))
 NOTE(decl_import_via_here,none,
      "%kind0 imported as "
      "'%select{private|fileprivate|internal|package|%ERROR|%ERROR}1' "
      "from %2 here",
-     (const ValueDecl *, AccessLevel, Identifier))
+     (const ValueDecl *, AccessLevel, const ModuleDecl*))
 
 // Opaque return types
 ERROR(opaque_type_invalid_constraint,none,

lib/Sema/TypeCheckAccess.cpp

@@ -330,11 +330,11 @@ static void noteLimitingImport(ASTContext &ctx,
                        diag::decl_import_via_here,
                        VD,
                        limitImport->accessLevel,
-                       limitImport->module.importedModule->getName());
+                       limitImport->module.importedModule);
   } else {
-   ctx.Diags.diagnose(limitImport->accessLevelLoc, diag::module_imported_here,
-                      limitImport->module.importedModule->getName(),
-                      limitImport->accessLevel);
+    ctx.Diags.diagnose(limitImport->accessLevelLoc, diag::module_imported_here,
+                       limitImport->module.importedModule,
+                       limitImport->accessLevel);
   }
 }