Merge pull request #1930 from slavapestov/sil-module-change

[Swift] Update for SILModule API change

apple-llvm-split-commit: 86d11a0b2ab34ee5670cae4fc71a3f13476ec900
apple-llvm-split-dir: lldb/

Author: slavapestov

lldb/include/lldb/Symbol/SwiftASTContext.h

@@ -51,6 +51,9 @@ namespace serialization {
 struct ValidationInfo;
 class ExtendedValidationInfo;
 }
+namespace Lowering {
+class TypeConverter;
+}
 }
 
 class DWARFASTParser;
@@ -768,6 +771,8 @@ class SwiftASTContext : public TypeSystem {
 
   swift::ModuleDecl *GetScratchModule();
 
+  swift::Lowering::TypeConverter *GetSILTypes();
+
   swift::SILModule *GetSILModule();
 
   swift::MemoryBufferSerializedModuleLoader *GetMemoryBufferModuleLoader();
@@ -808,6 +813,7 @@ class SwiftASTContext : public TypeSystem {
   /// should be printed by Process::PrintWarningCantLoadSwift().
   std::vector<std::string> m_module_import_warnings;
   swift::ModuleDecl *m_scratch_module = nullptr;
+  std::unique_ptr<swift::Lowering::TypeConverter> m_sil_types_ap;
   std::unique_ptr<swift::SILModule> m_sil_module_ap;
   /// Owned by the AST.
   swift::MemoryBufferSerializedModuleLoader *m_memory_buffer_module_loader =

lldb/source/Plugins/ExpressionParser/Swift/SwiftExpressionParser.cpp

@@ -71,6 +71,7 @@
 #include "swift/SIL/SILDebuggerClient.h"
 #include "swift/SIL/SILFunction.h"
 #include "swift/SIL/SILModule.h"
+#include "swift/SIL/TypeLowering.h"
 #include "swift/SILOptimizer/PassManager/Passes.h"
 #include "swift/Serialization/SerializedModuleLoader.h"
 #include "swift/Subsystems.h"
@@ -1633,8 +1634,14 @@ unsigned SwiftExpressionParser::Parse(DiagnosticManager &diagnostic_manager,
         variable_map[name] = *var_info;
       }
 
+  // FIXME: Should share TypeConverter instances
+  std::unique_ptr<swift::Lowering::TypeConverter> sil_types(
+      new swift::Lowering::TypeConverter(
+          *parsed_expr->source_file.getParentModule()));
+
   std::unique_ptr<swift::SILModule> sil_module(swift::performSILGeneration(
-      parsed_expr->source_file, swift_ast_ctx->GetSILOptions()));
+      parsed_expr->source_file, *sil_types,
+      swift_ast_ctx->GetSILOptions()));
 
   if (log) {
     std::string s;

lldb/source/Plugins/ExpressionParser/Swift/SwiftSILManipulator.cpp

@@ -81,7 +81,9 @@ swift::SILValue SwiftSILManipulator::emitLValueForVariable(
     return swift::SILValue();
 
   swift::ASTContext &ast_ctx = m_builder.getASTContext();
-  swift::Lowering::TypeConverter converter(m_builder.getModule());
+
+  // FIXME: Creating a new TypeLowering every time is wasteful.
+  swift::Lowering::TypeConverter converter(*m_builder.getModule().getSwiftModule());
 
   swift::SILLocation null_loc((swift::Decl *)nullptr);
   swift::SILType raw_pointer_type = swift::SILType::getRawPointerType(ast_ctx);

lldb/source/Symbol/SwiftASTContext.cpp

@@ -4758,11 +4758,21 @@ swift::ModuleDecl *SwiftASTContext::GetScratchModule() {
   return m_scratch_module;
 }
 
+swift::Lowering::TypeConverter *SwiftASTContext::GetSILTypes() {
+  VALID_OR_RETURN(nullptr);
+
+  if (m_sil_types_ap.get() == NULL)
+    m_sil_types_ap.reset(new swift::Lowering::TypeConverter(*GetScratchModule()));
+
+  return m_sil_types_ap.get();
+}
+
 swift::SILModule *SwiftASTContext::GetSILModule() {
   VALID_OR_RETURN(nullptr);
 
   if (m_sil_module_ap.get() == NULL)
     m_sil_module_ap = swift::SILModule::createEmptyModule(GetScratchModule(),
+                                                          *GetSILTypes(),
                                                           GetSILOptions());
   return m_sil_module_ap.get();
 }