[lumen] allow LLVMDialect to inherit LLVMContext

By allowing the LLVMDialect to be created with a reference
to a non-owned LLVMContext, we can create one LLVMContext
per thread and use it for everything. This prevents the issue
where MLIR-generated modules were created with their own context
and cannot be linked together or worked with using the thread-global
LLVMContext we create for that purpose in Lumen.

Author: bitwalker

mlir/include/mlir/Dialect/LLVMIR/LLVMOpBase.td

@@ -21,6 +21,7 @@ def LLVM_Dialect : Dialect {
   let cppNamespace = "LLVM";
   let hasRegionArgAttrVerify = 1;
   let extraClassDeclaration = [{
+    LLVMDialect(mlir::MLIRContext *, llvm::LLVMContext *);
     ~LLVMDialect();
     llvm::LLVMContext &getLLVMContext();
     llvm::Module &getLLVMModule();

mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp

@@ -1633,12 +1633,32 @@ static LogicalResult verify(FenceOp &op) {
 namespace mlir {
 namespace LLVM {
 namespace detail {
+struct LLVMContextHandle {
+  bool owned;
+  llvm::LLVMContext *context;
+
+  LLVMContextHandle() :
+      owned(true), context(new llvm::LLVMContext()) {}
+  LLVMContextHandle(llvm::LLVMContext *ctx) :
+      owned(false), context(ctx) {}
+
+  ~LLVMContextHandle() {
+    if (owned)
+      delete context;
+  }
+};
+
 struct LLVMDialectImpl {
-  LLVMDialectImpl() : module("LLVMDialectModule", llvmContext) {}
+  LLVMDialectImpl() 
+      : module("LLVMDialectModule", *llvmContext.context) {}
+  LLVMDialectImpl(llvm::LLVMContext *ctx)
+      : llvmContext(ctx), module("LLVMDialectModule", *ctx) {}
 
-  llvm::LLVMContext llvmContext;
+  LLVMContextHandle llvmContext;
   llvm::Module module;
 
+  bool ownsContext;
+
   /// A set of LLVMTypes that are cached on construction to avoid any lookups or
   /// locking.
   LLVMType int1Ty, int8Ty, int16Ty, int32Ty, int64Ty, int128Ty;
@@ -1653,6 +1673,38 @@ struct LLVMDialectImpl {
 } // end namespace LLVM
 } // end namespace mlir
 
+LLVMDialect::LLVMDialect(MLIRContext *context, llvm::LLVMContext *llvmCtx)
+    : Dialect(getDialectNamespace(), context),
+      impl(new detail::LLVMDialectImpl(llvmCtx)) {
+  addTypes<LLVMType>();
+  addOperations<
+#define GET_OP_LIST
+#include "mlir/Dialect/LLVMIR/LLVMOps.cpp.inc"
+      >();
+
+  // Support unknown operations because not all LLVM operations are registered.
+  allowUnknownOperations();
+
+  // Cache some of the common LLVM types to avoid the need for lookups/locking.
+  auto &llvmContext = impl->module.getContext();
+  /// Integer Types.
+  impl->int1Ty = LLVMType::get(context, llvm::Type::getInt1Ty(llvmContext));
+  impl->int8Ty = LLVMType::get(context, llvm::Type::getInt8Ty(llvmContext));
+  impl->int16Ty = LLVMType::get(context, llvm::Type::getInt16Ty(llvmContext));
+  impl->int32Ty = LLVMType::get(context, llvm::Type::getInt32Ty(llvmContext));
+  impl->int64Ty = LLVMType::get(context, llvm::Type::getInt64Ty(llvmContext));
+  impl->int128Ty = LLVMType::get(context, llvm::Type::getInt128Ty(llvmContext));
+  /// Float Types.
+  impl->doubleTy = LLVMType::get(context, llvm::Type::getDoubleTy(llvmContext));
+  impl->floatTy = LLVMType::get(context, llvm::Type::getFloatTy(llvmContext));
+  impl->halfTy = LLVMType::get(context, llvm::Type::getHalfTy(llvmContext));
+  impl->fp128Ty = LLVMType::get(context, llvm::Type::getFP128Ty(llvmContext));
+  impl->x86_fp80Ty =
+      LLVMType::get(context, llvm::Type::getX86_FP80Ty(llvmContext));
+  /// Other Types.
+  impl->voidTy = LLVMType::get(context, llvm::Type::getVoidTy(llvmContext));
+}
+
 LLVMDialect::LLVMDialect(MLIRContext *context)
     : Dialect(getDialectNamespace(), context),
       impl(new detail::LLVMDialectImpl()) {
@@ -1666,7 +1718,7 @@ LLVMDialect::LLVMDialect(MLIRContext *context)
   allowUnknownOperations();
 
   // Cache some of the common LLVM types to avoid the need for lookups/locking.
-  auto &llvmContext = impl->llvmContext;
+  auto &llvmContext = impl->module.getContext();
   /// Integer Types.
   impl->int1Ty = LLVMType::get(context, llvm::Type::getInt1Ty(llvmContext));
   impl->int8Ty = LLVMType::get(context, llvm::Type::getInt8Ty(llvmContext));
@@ -1690,7 +1742,7 @@ LLVMDialect::~LLVMDialect() {}
 #define GET_OP_CLASSES
 #include "mlir/Dialect/LLVMIR/LLVMOps.cpp.inc"
 
-llvm::LLVMContext &LLVMDialect::getLLVMContext() { return impl->llvmContext; }
+llvm::LLVMContext &LLVMDialect::getLLVMContext() { return impl->module.getContext(); }
 llvm::Module &LLVMDialect::getLLVMModule() { return impl->module; }
 
 /// Parse a type registered to this dialect.