Merge pull request #1088 from CodaFi/why-I-R-ta

Update for the removal of the LLVMContext parameter

Author: CodaFi

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

@@ -58,6 +58,7 @@
 #include "swift/AST/DiagnosticEngine.h"
 #include "swift/AST/DiagnosticConsumer.h"
 #include "swift/AST/IRGenOptions.h"
+#include "swift/AST/IRGenRequests.h"
 #include "swift/AST/Module.h"
 #include "swift/AST/ModuleLoader.h"
 #include "swift/Demangling/Demangle.h"
@@ -1659,11 +1660,15 @@ unsigned SwiftExpressionParser::Parse(DiagnosticManager &diagnostic_manager,
     std::lock_guard<std::recursive_mutex> global_context_locker(
         IRExecutionUnit::GetLLVMGlobalContextMutex());
 
-    m_module = swift::performIRGeneration(
+    auto GenModule = swift::performIRGeneration(
         swift_ast_ctx->GetIRGenOptions(), &parsed_expr->module,
         std::move(sil_module), "lldb_module",
         swift::PrimarySpecificPaths("", parsed_expr->main_filename),
-        SwiftASTContext::GetGlobalLLVMContext(), llvm::ArrayRef<std::string>());
+        llvm::ArrayRef<std::string>());
+      
+    auto ContextAndModule = std::move(GenModule).release();
+    m_llvm_context.reset(ContextAndModule.first);
+    m_module.reset(ContextAndModule.second);
   }
 
   if (swift_ast_ctx->HasErrors()) {
@@ -1813,10 +1818,9 @@ Status SwiftExpressionParser::PrepareForExecution(
 
   std::vector<std::string> features;
 
-  std::unique_ptr<llvm::LLVMContext> llvm_context_up;
   // m_module is handed off here.
   m_execution_unit_sp.reset(
-      new IRExecutionUnit(llvm_context_up, m_module, function_name,
+      new IRExecutionUnit(m_llvm_context, m_module, function_name,
                           exe_ctx.GetTargetSP(), sc, features));
 
   // TODO: figure out some way to work ClangExpressionDeclMap into

lldb/source/Symbol/SwiftASTContext.cpp

@@ -4885,7 +4885,7 @@ swift::irgen::IRGenModule &SwiftASTContext::GetIRGenModule() {
             IRExecutionUnit::GetLLVMGlobalContextMutex());
         m_ir_gen_module_ap.reset(new swift::irgen::IRGenModule(
             ir_generator, ir_generator.createTargetMachine(), nullptr,
-            GetGlobalLLVMContext(), ir_gen_opts.ModuleName, PSPs.OutputFilename,
+            ir_gen_opts.ModuleName, PSPs.OutputFilename,
             PSPs.MainInputFilenameForDebugInfo, ""));
         llvm::Module *llvm_module = m_ir_gen_module_ap->getModule();
         llvm_module->setDataLayout(data_layout.getStringRepresentation());