[lldb] Rework PCM validation disable for Swift (#10974)

kastiglione · kastiglione · commit db0d74739531 · 2025-10-06T10:16:46.000-07:00
The `Preprocessor`'s options have changed to be `const` in llvm@277ab85. Since lldb can no longer mutate the options before constructing a clang importer, this change is to setup the options ahead of time. (cherry picked from commit de06c52) (cherry-picked from commit 30f191f9e843501231cf64c58ae4e47bd6d97a3f)
diff --git a/lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.cpp b/lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.cpp
@@ -1818,10 +1818,10 @@ void SwiftASTContext::ConfigureModuleValidation(
 #endif
   }
 
-  if (!validate_pcm)
+  if (!validate_pcm) {
     extra_args.push_back("-fno-modules-check-relocated");
-  LOG_PRINTF(GetLog(LLDBLog::Types), "PCM validation is %s",
-             validate_pcm ? "disabled" : "enabled");
+    LOG_PRINTF(GetLog(LLDBLog::Types), "PCM validation is disabled");
+  }
 }
 
 void SwiftASTContext::AddExtraClangArgs(

Original file line number	Diff line number	Diff line change
`@@ -1818,10 +1818,10 @@ void SwiftASTContext::ConfigureModuleValidation(`
`1818`	`1818`	`#endif`
`1819`	`1819`	`}`
`1820`	`1820`
`1821`		`- if (!validate_pcm)`
	`1821`	`+ if (!validate_pcm) {`
`1822`	`1822`	`extra_args.push_back("-fno-modules-check-relocated");`
`1823`		`- LOG_PRINTF(GetLog(LLDBLog::Types), "PCM validation is %s",`
`1824`		`- validate_pcm ? "disabled" : "enabled");`
	`1823`	`+ LOG_PRINTF(GetLog(LLDBLog::Types), "PCM validation is disabled");`
	`1824`	`+ }`
`1825`	`1825`	`}`
`1826`	`1826`
`1827`	`1827`	`void SwiftASTContext::AddExtraClangArgs(`