[clang] [clang][Modules] Diagnosing Module Redefinition Across ModuleMaps (PR #190085)

[Cyndy Ishida via cfe-commits]

================
@@ -1756,9 +1756,24 @@ void ModuleMapLoader::handleModuleDecl(const modulemap::ModuleDecl &MD) {
   if (Module *Existing = Map.lookupModuleQualified(ModuleName, ActiveModule)) {
     // We might see a (re)definition of a module that we already have a
     // definition for in four cases:
-    //  - If we loaded one definition from an AST file and we've just found a
-    //    corresponding definition in a module map file, or
+    //  - If we loaded one definition from an AST file and we've just found the
+    //    corresponding definition in the same module map file, or
     bool LoadedFromASTFile = Existing->IsFromModuleFile;
+    if (LoadedFromASTFile) {
----------------
cyndyishida wrote:

I see, so previously `LoadedFromASTFile` was short-circuiting the propagation of that check? I would think `SameModuleDecl = ModuleNameLoc == Existing->DefinitionLoc;` would cover all cases, which makes me wonder why the check for module map `FileEntry`'s is needed. 

https://github.com/llvm/llvm-project/pull/190085