Merge pull request #11989 from swiftlang/lldb/sdk-search-error-to-6.3

adrian-prantl · web-flow · commit f9bacdd28a8a · 2025-12-16T08:47:44.000-08:00
🍒[lldb][Module] Only log SDK search error once per debugger session
diff --git a/lldb/source/Core/Module.cpp b/lldb/source/Core/Module.cpp
@@ -1708,7 +1708,9 @@ void Module::RegisterXcodeSDK(llvm::StringRef sdk_name,
 
   if (!sdk_path_or_err) {
     Debugger::ReportError("Error while searching for Xcode SDK: " +
-                          toString(sdk_path_or_err.takeError()));
+                              toString(sdk_path_or_err.takeError()),
+                          /*debugger_id=*/std::nullopt,
+                          GetDiagnosticOnceFlag(sdk_name));
     return;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -1708,7 +1708,9 @@ void Module::RegisterXcodeSDK(llvm::StringRef sdk_name,`
`1708`	`1708`
`1709`	`1709`	`if (!sdk_path_or_err) {`
`1710`	`1710`	`Debugger::ReportError("Error while searching for Xcode SDK: " +`
`1711`		`- toString(sdk_path_or_err.takeError()));`
	`1711`	`+ toString(sdk_path_or_err.takeError()),`
	`1712`	`+ /debugger_id=/std::nullopt,`
	`1713`	`+ GetDiagnosticOnceFlag(sdk_name));`
`1712`	`1714`	`return;`
`1713`	`1715`	`}`
`1714`	`1716`