Merge pull request #42196 from xymus/deser-print-ext-module

[Serialization] Always print the `name` associated to an `XRefError`

Author: xymus

lib/Serialization/Deserialization.cpp

@@ -1891,7 +1891,7 @@ ModuleFile::resolveCrossReference(ModuleID MID, uint32_t pathLen) {
       XRefExtensionPathPieceLayout::readRecord(scratch, ownerID, rawGenericSig);
       M = getModule(ownerID);
       if (!M) {
-        return llvm::make_error<XRefError>("module is not loaded",
+        return llvm::make_error<XRefError>("module with extension is not loaded",
                                            pathTrace, getIdentifier(ownerID));
       }
       pathTrace.addExtension(M);

lib/Serialization/DeserializationErrors.h

@@ -282,7 +282,7 @@ class XRefError : public llvm::ErrorInfo<XRefError, DeclDeserializationError> {
   }
 
   void log(raw_ostream &OS) const override {
-    OS << message << "\n";
+    OS << message << " (" << name << ")\n";
     path.print(OS);
 
     if (!notes.empty()) {