LLVM global initialization (#167)

* Add template member test

* Add LLVM global initialization

Author: wsmoses

tools/mlir-clang/Lib/clang-mlir.cc

@@ -3746,9 +3746,6 @@ MLIRASTConsumer::GetOrCreateLLVMGlobal(const ValueDecl *FD,
     break;
   }
 
-  if (cast<VarDecl>(FD)->getInit())
-    cast<VarDecl>(FD)->getInit()->dump();
-
   auto rt = getMLIRType(FD->getType());
 
   mlir::OpBuilder builder(module->getContext());
@@ -3757,17 +3754,24 @@ MLIRASTConsumer::GetOrCreateLLVMGlobal(const ValueDecl *FD,
   auto glob = builder.create<LLVM::GlobalOp>(
       module->getLoc(), rt, /*constant*/ false, lnk, name, mlir::Attribute());
 
-  if (cast<VarDecl>(FD)->isThisDeclarationADefinition() ==
+  if (cast<VarDecl>(FD)->getInit() ||
+      cast<VarDecl>(FD)->isThisDeclarationADefinition() ==
           VarDecl::Definition ||
       cast<VarDecl>(FD)->isThisDeclarationADefinition() ==
           VarDecl::TentativeDefinition) {
     Block *blk = new Block();
     glob.getInitializerRegion().push_back(blk);
     builder.setInsertionPointToStart(blk);
-    builder.create<LLVM::ReturnOp>(
-        module->getLoc(),
-        std::vector<mlir::Value>(
-            {builder.create<LLVM::UndefOp>(module->getLoc(), rt)}));
+    mlir::Value res;
+    if (auto init = cast<VarDecl>(FD)->getInit()) {
+      MLIRScanner ms(*this, module, LTInfo);
+      ms.setEntryAndAllocBlock(blk);
+      res = ms.Visit(const_cast<Expr *>(init)).getValue(builder);
+    } else {
+      res = builder.create<LLVM::UndefOp>(module->getLoc(), rt);
+    }
+    builder.create<LLVM::ReturnOp>(module->getLoc(),
+                                   std::vector<mlir::Value>({res}));
   }
   return llvmGlobals[name] = glob;
 }

tools/mlir-clang/Test/Verification/templatemember.cpp

@@ -0,0 +1,26 @@
+// RUN: mlir-clang %s --function=* -S | FileCheck %s
+
+class House;
+
+template <typename T>
+class Info;
+
+template <>
+class Info<House>{
+public:
+  static constexpr bool has_infinity = true;
+};
+
+bool add_kernel_cuda() {
+  return Info<House>::has_infinity;
+}
+
+//  CHECK:   llvm.mlir.global external @_ZN4InfoI5HouseE12has_infinityE() : i8 {
+//  CHECK-NEXT:     %c1_i8 = arith.constant 1 : i8
+//  CHECK-NEXT:     llvm.return %c1_i8 : i8
+//  CHECK-NEXT:   }
+//  CHECK:   func @_Z15add_kernel_cudav() -> i8 attributes {llvm.linkage = #llvm.linkage<external>} {
+//  CHECK-NEXT:     %0 = llvm.mlir.addressof @_ZN4InfoI5HouseE12has_infinityE : !llvm.ptr<i8>
+//  CHECK-NEXT:     %1 = llvm.load %0 : !llvm.ptr<i8>
+//  CHECK-NEXT:     return %1 : i8
+//  CHECK-NEXT:   }