Skip to content

[stable/21.x] lldb: required changes for removing the -enable-ossa-modules option in the swift compiler #11515

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 28, 2025
Merged

[stable/21.x] lldb: required changes for removing the -enable-ossa-modules option in the swift compiler #11515

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1158,9 +1158,6 @@ static const char *getImportFailureString(swift::serialization::Status status) {
case swift::serialization::Status::RevisionIncompatible:
return "The module file was built with library evolution enabled by a "
"different version of the compiler.";
case swift::serialization::Status::NotInOSSA:
return "The module file was not compiled with -enable-ossa-modules when it "
"was required to do so.";
case swift::serialization::Status::SDKMismatch:
return "The module file was built with a different SDK version.";
case swift::serialization::Status::ChannelIncompatible:
Expand Down Expand Up @@ -1347,7 +1344,7 @@ static bool DeserializeAllCompilerFlags(swift::CompilerInvocation &invocation,
llvm::SmallVector<swift::serialization::SearchPath> searchPaths;
swift::serialization::ExtendedValidationInfo extended_validation_info;
info = swift::serialization::validateSerializedAST(
buf, invocation.getSILOptions().EnableOSSAModules,
buf,
/*requiredSDK*/ StringRef(), &extended_validation_info,
/*dependencies*/ nullptr, &searchPaths);
bool invalid_ast = info.status != swift::serialization::Status::Valid;
Expand Down Expand Up @@ -3786,8 +3783,7 @@ ThreadSafeASTContext SwiftASTContext::GetASTContext() {
m_ast_context_ap->addModuleInterfaceChecker(
std::make_unique<swift::ModuleInterfaceCheckerImpl>(*m_ast_context_ap,
moduleCachePath, prebuiltModuleCachePath,
swift::ModuleInterfaceLoaderOptions(),
swift::RequireOSSAModules_t(GetSILOptions())));
swift::ModuleInterfaceLoaderOptions()));

// 2. Create and install the module interface loader.
//
Expand Down