[rebranch][lldb] Handle new requires OSSA option

swift f458d9b added checking for the
dependencies of any module compiled with `-enable-ossa-modules` to also
be compiled with `-enable-ossa-modules`.

Author: bnbarham

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

@@ -1268,6 +1268,13 @@ static const char *getImportFailureString(swift::serialization::Status status) {
   case swift::serialization::Status::TargetTooNew:
     return "The module file was built for a target newer than the current "
            "target.";
+  case swift::serialization::Status::RevisionIncompatible:
+    return "The module file was built for 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.";
   }
 }
 
@@ -1355,7 +1362,7 @@ static bool DeserializeAllCompilerFlags(swift::CompilerInvocation &invocation,
     for (; !buf.empty(); buf = buf.substr(info.bytes)) {
       swift::serialization::ExtendedValidationInfo extended_validation_info;
       info = swift::serialization::validateSerializedAST(
-          buf, &extended_validation_info);
+          buf, /*requiresOSSAModules=*/false, &extended_validation_info);
       bool invalid_ast = info.status != swift::serialization::Status::Valid;
       bool invalid_size = (info.bytes == 0) || (info.bytes > buf.size());
       bool invalid_name = info.name.empty();
@@ -3347,9 +3354,9 @@ swift::ASTContext *SwiftASTContext::GetASTContext() {
 
   LLDB_SCOPED_TIMER();
   m_ast_context_ap.reset(swift::ASTContext::get(
-      GetLanguageOptions(), GetTypeCheckerOptions(), GetSearchPathOptions(),
-      GetClangImporterOptions(), GetSymbolGraphOptions(),
-      GetSourceManager(), GetDiagnosticEngine()));
+      GetLanguageOptions(), GetTypeCheckerOptions(), GetSILOptions(),
+      GetSearchPathOptions(), GetClangImporterOptions(),
+      GetSymbolGraphOptions(), GetSourceManager(), GetDiagnosticEngine()));
   m_diagnostic_consumer_ap.reset(new StoringDiagnosticConsumer(*this));
 
   if (getenv("LLDB_SWIFT_DUMP_DIAGS")) {