Merge commit '3a3d7e233e52' from swift/release/6.3 into stable/21.x

git apple-llvm automerger · git apple-llvm automerger · commit a2d9193c94a0 · 2025-12-02T14:13:51.000-08:00
diff --git a/lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.cpp b/lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.cpp
@@ -1186,7 +1186,9 @@ static const char *getImportFailureString(swift::serialization::Status status) {
   case swift::serialization::Status::SDKMismatch:
     return "The module file was built with a different SDK version.";
   case swift::serialization::Status::ChannelIncompatible:
-    return "The distribution channel doesn't match.";
+    return "The distribution channel doesn't match."
+           " This version of LLDB is most likely from a different toolchain"
+           " than the Swift compiler that built this module.";
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1186,7 +1186,9 @@ static const char *getImportFailureString(swift::serialization::Status status) {`
`1186`	`1186`	`case swift::serialization::Status::SDKMismatch:`
`1187`	`1187`	`return "The module file was built with a different SDK version.";`
`1188`	`1188`	`case swift::serialization::Status::ChannelIncompatible:`
`1189`		`- return "The distribution channel doesn't match.";`
	`1189`	`+ return "The distribution channel doesn't match."`
	`1190`	`+ " This version of LLDB is most likely from a different toolchain"`
	`1191`	`+ " than the Swift compiler that built this module.";`
`1190`	`1192`	`}`
`1191`	`1193`	`}`
`1192`	`1194`