[clang][modules] Fix modules TS test

Author: jansvoboda11

clang/lib/Sema/SemaModule.cpp

@@ -269,10 +269,10 @@ Sema::ActOnModuleDecl(SourceLocation StartLoc, SourceLocation ModuleLoc,
     // module map defining it already.
     if (auto *M = Map.findModule(ModuleName)) {
       Diag(Path[0].second, diag::err_module_redefinition) << ModuleName;
-      if (M->DefinitionLoc.isValid())
+      if (M->DefinitionLoc.isValid() && !M->IsFromModuleFile)
         Diag(M->DefinitionLoc, diag::note_prev_module_definition);
       else if (Optional<FileEntryRef> FE = M->getASTFile())
-        Diag(M->DefinitionLoc, diag::note_prev_module_definition_from_ast_file)
+        Diag(SourceLocation(), diag::note_prev_module_definition_from_ast_file)
             << FE->getName();
       Mod = M;
       break;

clang/test/SemaCXX/modules-ts.cppm

@@ -17,13 +17,15 @@ static int m;
 #if TEST == 2
 // expected-error@-2 {{redefinition of '}}
 // expected-note@-3 {{unguarded header; consider using #ifdef guards or #pragma once}}
+// expected-note@-10 {{foo defined here}}
 // FIXME: We should drop the "header from" in this diagnostic.
 // [email protected]:1 {{'{{.*}}modules-ts.cppm' included multiple times, additional include site in header from module 'foo'}}
 #endif
 int n;
 #if TEST == 2
 // expected-error@-2 {{redefinition of '}}
 // expected-note@-3 {{unguarded header; consider using #ifdef guards or #pragma once}}
+// expected-note@-18 {{foo defined here}}
 // FIXME: We should drop the "header from" in this diagnostic.
 // [email protected]:1 {{'{{.*}}modules-ts.cppm' included multiple times, additional include site in header from module 'foo'}}
 #endif