Skip to content

Commit 71f0abb

Browse files
eecksteinAnthonyLatsis
authored andcommitted
lldb: required changes for removing the -enable-ossa-modules option in the swift compiler
(cherry picked from commit d8e3059)
1 parent 34bdb2f commit 71f0abb

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.cpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1158,9 +1158,6 @@ static const char *getImportFailureString(swift::serialization::Status status) {
11581158
case swift::serialization::Status::RevisionIncompatible:
11591159
return "The module file was built with library evolution enabled by a "
11601160
"different version of the compiler.";
1161-
case swift::serialization::Status::NotInOSSA:
1162-
return "The module file was not compiled with -enable-ossa-modules when it "
1163-
"was required to do so.";
11641161
case swift::serialization::Status::SDKMismatch:
11651162
return "The module file was built with a different SDK version.";
11661163
case swift::serialization::Status::ChannelIncompatible:
@@ -1347,7 +1344,7 @@ static bool DeserializeAllCompilerFlags(swift::CompilerInvocation &invocation,
13471344
llvm::SmallVector<swift::serialization::SearchPath> searchPaths;
13481345
swift::serialization::ExtendedValidationInfo extended_validation_info;
13491346
info = swift::serialization::validateSerializedAST(
1350-
buf, invocation.getSILOptions().EnableOSSAModules,
1347+
buf,
13511348
/*requiredSDK*/ StringRef(), &extended_validation_info,
13521349
/*dependencies*/ nullptr, &searchPaths);
13531350
bool invalid_ast = info.status != swift::serialization::Status::Valid;
@@ -3786,8 +3783,7 @@ ThreadSafeASTContext SwiftASTContext::GetASTContext() {
37863783
m_ast_context_ap->addModuleInterfaceChecker(
37873784
std::make_unique<swift::ModuleInterfaceCheckerImpl>(*m_ast_context_ap,
37883785
moduleCachePath, prebuiltModuleCachePath,
3789-
swift::ModuleInterfaceLoaderOptions(),
3790-
swift::RequireOSSAModules_t(GetSILOptions())));
3786+
swift::ModuleInterfaceLoaderOptions()));
37913787

37923788
// 2. Create and install the module interface loader.
37933789
//

0 commit comments

Comments
 (0)