@@ -1268,6 +1268,8 @@ static const char *getImportFailureString(swift::serialization::Status status) {
1268
1268
case swift::serialization::Status::TargetTooNew:
1269
1269
return " The module file was built for a target newer than the current "
1270
1270
" target." ;
1271
+ case swift::serialization::Status::NotInOSSA:
1272
+ return " The module file was not built with -enable-ossa-modules" ;
1271
1273
}
1272
1274
}
1273
1275
@@ -1355,7 +1357,7 @@ static bool DeserializeAllCompilerFlags(swift::CompilerInvocation &invocation,
1355
1357
for (; !buf.empty (); buf = buf.substr (info.bytes )) {
1356
1358
swift::serialization::ExtendedValidationInfo extended_validation_info;
1357
1359
info = swift::serialization::validateSerializedAST (
1358
- buf, &extended_validation_info);
1360
+ buf, invocation. getSILOptions (). EnableOSSAModules , &extended_validation_info);
1359
1361
bool invalid_ast = info.status != swift::serialization::Status::Valid;
1360
1362
bool invalid_size = (info.bytes == 0 ) || (info.bytes > buf.size ());
1361
1363
bool invalid_name = info.name .empty ();
@@ -3347,9 +3349,9 @@ swift::ASTContext *SwiftASTContext::GetASTContext() {
3347
3349
3348
3350
LLDB_SCOPED_TIMER ();
3349
3351
m_ast_context_ap.reset (swift::ASTContext::get (
3350
- GetLanguageOptions (), GetTypeCheckerOptions (), GetSearchPathOptions (),
3351
- GetClangImporterOptions (), GetSymbolGraphOptions (),
3352
- GetSourceManager (), GetDiagnosticEngine ()));
3352
+ GetLanguageOptions (), GetTypeCheckerOptions (), GetSILOptions (),
3353
+ GetSearchPathOptions (), GetClangImporterOptions (),
3354
+ GetSymbolGraphOptions (), GetSourceManager (), GetDiagnosticEngine ()));
3353
3355
m_diagnostic_consumer_ap.reset (new StoringDiagnosticConsumer (*this ));
3354
3356
3355
3357
if (getenv (" LLDB_SWIFT_DUMP_DIAGS" )) {
0 commit comments