Merge pull request #36780 from xymus/revert-crash-path

[Serialization] Revert the change to path printing on failures

Author: xymus

lib/Serialization/DeserializationErrors.h

@@ -222,11 +222,12 @@ class XRefTracePath {
   }
 
   void print(raw_ostream &os, StringRef leading = "") const {
-    os << "Cross-reference to '";
-    interleave(path,
-               [&](auto &piece) { piece.print(os); },
-               [&] { os << '.'; });
-    os << "' in module '" << baseM.getName() << "'\n";
+    os << "Cross-reference to module '" << baseM.getName() << "'\n";
+    for (auto &piece : path) {
+      os << leading << "... ";
+      piece.print(os);
+      os << "\n";
+    }
   }
 };
 

test/Serialization/Recovery/crash-xref.swift

@@ -30,6 +30,7 @@ public func foo() -> A.SomeType { fatalError() }
 // CHECK: *** DESERIALIZATION FAILURE (please include this section in any bug report) ***
 // CHECK-NEXT: Could not deserialize type for 'foo()'
 // CHECK-NEXT: Caused by: top-level value not found
-// CHECK-NEXT: Cross-reference to 'SomeType' in module 'A'
+// CHECK-NEXT: Cross-reference to module 'A'
+// CHECK-NEXT: ... SomeType
 // 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.