Merge pull request #75659 from xymus/shadow-dont-warn-with-alias-workaround

ModuleInterface: Don't warn on name conflict when the alias workaround is enabled

lib/Frontend/ModuleInterfaceSupport.cpp

@@ -184,7 +184,8 @@ static void
 diagnoseDeclShadowsModule(ModuleInterfaceOptions const &Opts,
                           TypeDecl *shadowingDecl, ModuleDecl *shadowedModule,
                           ModuleDecl *brokenModule) {
-  if (Opts.PreserveTypesAsWritten || shadowingDecl == shadowedModule)
+  if (Opts.PreserveTypesAsWritten || Opts.AliasModuleNames ||
+      shadowingDecl == shadowedModule)
     return;
 
   shadowingDecl->diagnose(