Merge pull request #9895 from swiftlang/cherrypick-4482ff71fd90

[NFC] Add SerializationOptions to SwiftASTContext

Author: JDevlieghere

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

@@ -53,6 +53,7 @@
 #include "swift/IRGen/Linking.h"
 #include "swift/SIL/SILModule.h"
 #include "swift/Sema/IDETypeChecking.h"
+#include "swift/Serialization/SerializationOptions.h"
 #include "swift/Serialization/Validation.h"
 #include "swift/SymbolGraphGen/SymbolGraphOptions.h"
 
@@ -3462,6 +3463,10 @@ swift::CASOptions &SwiftASTContext::GetCASOptions() {
   return GetCompilerInvocation().getCASOptions();
 }
 
+swift::SerializationOptions &SwiftASTContext::GetSerializationOptions() {
+  return GetCompilerInvocation().getSerializationOptions();
+}
+
 swift::DiagnosticEngine &SwiftASTContext::GetDiagnosticEngine() {
   if (!m_diagnostic_engine_ap) {
     m_diagnostic_engine_ap.reset(
@@ -3653,9 +3658,8 @@ ThreadSafeASTContext SwiftASTContext::GetASTContext() {
   m_ast_context_ap.reset(swift::ASTContext::get(
       GetLanguageOptions(), GetTypeCheckerOptions(), GetSILOptions(),
       GetSearchPathOptions(), GetClangImporterOptions(),
-      GetSymbolGraphOptions(), GetCASOptions(), GetSourceManager(),
-      GetDiagnosticEngine(),
-      /*OutputBackend=*/nullptr));
+      GetSymbolGraphOptions(), GetCASOptions(), GetSerializationOptions(),
+      GetSourceManager(), GetDiagnosticEngine(), /*OutputBackend=*/nullptr));
 
   if (getenv("LLDB_SWIFT_DUMP_DIAGS")) {
     // NOTE: leaking a swift::PrintingDiagnosticConsumer() here, but

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

@@ -26,6 +26,7 @@
 #include "swift/AST/Module.h"
 #include "swift/Demangling/ManglingFlavor.h"
 #include "swift/Parse/ParseVersion.h"
+#include "swift/Serialization/SerializationOptions.h"
 #include "swift/SymbolGraphGen/SymbolGraphOptions.h"
 
 #include "llvm/ADT/SmallVector.h"
@@ -252,6 +253,8 @@ class SwiftASTContext : public TypeSystemSwift {
 
   swift::SearchPathOptions &GetSearchPathOptions();
 
+  swift::SerializationOptions &GetSerializationOptions();
+
   void InitializeSearchPathOptions(
       llvm::ArrayRef<std::pair<std::string, bool>> module_search_paths,
       llvm::ArrayRef<std::pair<std::string, bool>> framework_search_paths);

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

@@ -82,6 +82,7 @@ class ClangNameImporter {
         m_compiler_invocation.getClangImporterOptions(),
         m_compiler_invocation.getSymbolGraphOptions(),
         m_compiler_invocation.getCASOptions(),
+        m_compiler_invocation.getSerializationOptions(),
         m_source_manager, m_diagnostic_engine));
     m_clang_importer = swift::ClangImporter::create(*m_ast_context, "", {}, {});
   }