Merge pull request #9492 from swiftlang/serializationopts

[NFC] Add SerializationOptions to SwiftASTContext

Author: felipepiovezan

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

@@ -50,6 +50,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"
 
@@ -3345,6 +3346,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(
@@ -3536,9 +3541,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

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

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

@@ -65,15 +65,16 @@ class ClangNameImporter {
       : m_source_manager(FileSystem::Instance().GetVirtualFileSystem()),
         m_diagnostic_engine(m_source_manager) {
     m_compiler_invocation.getLangOptions() = lang_opts;
-    m_ast_context.reset(swift::ASTContext::get(
-        m_compiler_invocation.getLangOptions(),
-        m_compiler_invocation.getTypeCheckerOptions(),
-        m_compiler_invocation.getSILOptions(),
-        m_compiler_invocation.getSearchPathOptions(),
-        m_compiler_invocation.getClangImporterOptions(),
-        m_compiler_invocation.getSymbolGraphOptions(),
-        m_compiler_invocation.getCASOptions(),
-        m_source_manager, m_diagnostic_engine));
+    m_ast_context.reset(
+        swift::ASTContext::get(m_compiler_invocation.getLangOptions(),
+                               m_compiler_invocation.getTypeCheckerOptions(),
+                               m_compiler_invocation.getSILOptions(),
+                               m_compiler_invocation.getSearchPathOptions(),
+                               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, "", {}, {});
   }