[Serialization] Shorten and fix reference to wrong module in note

Author: xymus

lib/Serialization/Deserialization.cpp

@@ -1528,11 +1528,9 @@ ModuleFile::resolveCrossReference(ModuleID MID, uint32_t pathLen) {
           // Found a full match in a different module. It should be a different
           // one because otherwise it would have succeeded on the first search.
           // This is usually caused by the use of poorly modularized headers.
-          auto line = "'" +
+          auto line = "There is a matching '" +
                       declName.getString(strScratch).str() +
-                      "' was not found in module '" +
-                      std::string(baseModule->getName().str()) +
-                      "', but there is one in module '" +
+                      "' in module '" +
                       std::string(nameAndModule.first.str()) +
                       "'. If this is imported from clang, please make sure " +
                       "the header is part of a single clang module.";
@@ -1545,7 +1543,7 @@ ModuleFile::resolveCrossReference(ModuleID MID, uint32_t pathLen) {
           auto line = "'" +
                       declName.getString(strScratch).str() +
                       "' in module '" +
-                      std::string(baseModule->getName().str()) +
+                      std::string(nameAndModule.first.str()) +
                       "' was filtered out.";
           notes.emplace_back(line);
         }

test/Serialization/Recovery/crash-xref.swift

@@ -32,4 +32,4 @@ public func foo() -> A.SomeType { fatalError() }
 // CHECK-NEXT: Caused by: top-level value not found
 // CHECK-NEXT: Cross-reference to 'SomeType' in module 'A'
 // CHECK-NEXT: Notes:
-// CHECK-NEXT: * 'SomeType' was not found in module 'B', but there is one in module 'B'. If this is imported from clang, please make sure the header is part of a single clang module.
+// CHECK-NEXT: * There is a matching 'SomeType' in module 'B'. If this is imported from clang, please make sure the header is part of a single clang module.