Fix builtin addressof handling and reference type initexpr (#304)

* Fix builtin addressof handling and reference type initexpr

* clang-format

* Fix warning print

Author: ivanradanov

tools/cgeist/Lib/CGCall.cc

@@ -10,6 +10,7 @@
 #include "clang-mlir.h"
 #include "mlir/Dialect/GPU/IR/GPUDialect.h"
 #include "utils.h"
+#include "clang/Basic/Builtins.h"
 
 #define DEBUG_TYPE "CGCall"
 
@@ -367,6 +368,8 @@ ValueCategory MLIRScanner::CallHelper(
 
 std::pair<ValueCategory, bool>
 MLIRScanner::EmitClangBuiltinCallExpr(clang::CallExpr *expr) {
+  auto loc = getMLIRLocation(expr->getExprLoc());
+
   switch (expr->getBuiltinCallee()) {
   case clang::Builtin::BImove:
   case clang::Builtin::BImove_if_noexcept:
@@ -375,6 +378,34 @@ MLIRScanner::EmitClangBuiltinCallExpr(clang::CallExpr *expr) {
     auto V = Visit(expr->getArg(0));
     return make_pair(V, true);
   }
+  case clang::Builtin::BIaddressof:
+  case clang::Builtin::BI__addressof:
+  case clang::Builtin::BI__builtin_addressof: {
+    auto V = Visit(expr->getArg(0));
+    assert(V.isReference);
+    mlir::Value val = V.val;
+    auto T = getMLIRType(expr->getType());
+    if (T == val.getType())
+      return make_pair(ValueCategory(val, /*isRef*/ false), true);
+    if (T.isa<LLVM::LLVMPointerType>()) {
+      if (val.getType().isa<MemRefType>())
+        val = builder.create<polygeist::Memref2PointerOp>(loc, T, val);
+      else if (T != val.getType())
+        val = builder.create<LLVM::BitcastOp>(loc, T, val);
+      return make_pair(ValueCategory(val, /*isRef*/ false), true);
+    } else {
+      assert(T.isa<MemRefType>());
+      if (val.getType().isa<MemRefType>())
+        val = builder.create<polygeist::Memref2PointerOp>(
+            loc, LLVM::LLVMPointerType::get(builder.getI8Type()), val);
+      if (val.getType().isa<LLVM::LLVMPointerType>())
+        val = builder.create<polygeist::Pointer2MemrefOp>(loc, T, val);
+      return make_pair(ValueCategory(val, /*isRef*/ false), true);
+    }
+    expr->dump();
+    llvm::errs() << " val: " << val << " T: " << T << "\n";
+    assert(0 && "unhandled builtin addressof");
+  }
   default:
     break;
   }
@@ -591,36 +622,6 @@ ValueCategory MLIRScanner::VisitCallExpr(clang::CallExpr *expr) {
         return Visit(expr->getArg(0));
       }
     }
-  if (auto *ic = dyn_cast<ImplicitCastExpr>(expr->getCallee()))
-    if (auto *sr = dyn_cast<DeclRefExpr>(ic->getSubExpr())) {
-      if (sr->getDecl()->getIdentifier() &&
-          sr->getDecl()->getName() == "__builtin_addressof") {
-        auto V = Visit(expr->getArg(0));
-        assert(V.isReference);
-        mlir::Value val = V.val;
-        auto T = getMLIRType(expr->getType());
-        if (T == val.getType())
-          return ValueCategory(val, /*isRef*/ false);
-        if (T.isa<LLVM::LLVMPointerType>()) {
-          if (val.getType().isa<MemRefType>())
-            val = builder.create<polygeist::Memref2PointerOp>(loc, T, val);
-          else if (T != val.getType())
-            val = builder.create<LLVM::BitcastOp>(loc, T, val);
-          return ValueCategory(val, /*isRef*/ false);
-        } else {
-          assert(T.isa<MemRefType>());
-          if (val.getType().isa<MemRefType>())
-            val = builder.create<polygeist::Memref2PointerOp>(
-                loc, LLVM::LLVMPointerType::get(builder.getI8Type()), val);
-          if (val.getType().isa<LLVM::LLVMPointerType>())
-            val = builder.create<polygeist::Pointer2MemrefOp>(loc, T, val);
-          return ValueCategory(val, /*isRef*/ false);
-        }
-        expr->dump();
-        llvm::errs() << " val: " << val << " T: " << T << "\n";
-        assert(0 && "unhandled builtin addressof");
-      }
-    }
   if (auto *ic = dyn_cast<ImplicitCastExpr>(expr->getCallee()))
     if (auto *sr = dyn_cast<DeclRefExpr>(ic->getSubExpr())) {
       if (sr->getDecl()->getIdentifier() &&
@@ -1406,6 +1407,11 @@ ValueCategory MLIRScanner::VisitCallExpr(clang::CallExpr *expr) {
     }
 #endif
 
+  if (auto BI = expr->getBuiltinCallee())
+    if (!Glob.CGM.getContext().BuiltinInfo.isPredefinedLibFunction(BI))
+      llvm::errs() << "warning: we failed to emit call to builtin function "
+                   << Glob.CGM.getContext().BuiltinInfo.getName(BI) << "\n";
+
   const auto *callee = EmitCallee(expr->getCallee());
 
   std::set<std::string> funcs = {

tools/cgeist/Lib/clang-mlir.cc

@@ -370,6 +370,10 @@ void MLIRScanner::init(mlir::func::FuncOp function, const FunctionDecl *fd) {
         expr->getInit()->dump();
         assert(initexpr.val);
       }
+      if (field->getType()->isReferenceType()) {
+        assert(initexpr.isReference);
+        initexpr.isReference = false;
+      }
       bool isArray = false;
       Glob.getMLIRType(expr->getInit()->getType(), &isArray);
 

tools/cgeist/Test/Verification/addressof.cpp

@@ -0,0 +1,31 @@
+// RUN: cgeist %s %stdinclude --function=* -S | FileCheck %s
+
+#include <memory>
+ 
+struct Ptr {
+};
+ 
+Ptr *foo()
+{
+	Ptr p;
+	return std::addressof(p);  // calls Ptr<int>* overload, (= this)
+}
+
+Ptr *bar()
+{
+	Ptr p;
+	return __builtin_addressof(p);  // calls Ptr<int>* overload, (= this)
+}
+
+// CHECK-LABEL:   func.func @_Z3foov() -> memref<?x!llvm.struct<(i8)>> attributes {llvm.linkage = #llvm.linkage<external>} {
+// CHECK:           %[[VAL_0:.*]] = memref.alloca() : memref<1x!llvm.struct<(i8)>>
+// CHECK:           %[[VAL_1:.*]] = memref.cast %[[VAL_0]] : memref<1x!llvm.struct<(i8)>> to memref<?x!llvm.struct<(i8)>>
+// CHECK:           return %[[VAL_1]] : memref<?x!llvm.struct<(i8)>>
+// CHECK:         }
+
+// CHECK-LABEL:   func.func @_Z3barv() -> memref<?x!llvm.struct<(i8)>> attributes {llvm.linkage = #llvm.linkage<external>} {
+// CHECK:           %[[VAL_0:.*]] = memref.alloca() : memref<1x!llvm.struct<(i8)>>
+// CHECK:           %[[VAL_1:.*]] = memref.cast %[[VAL_0]] : memref<1x!llvm.struct<(i8)>> to memref<?x!llvm.struct<(i8)>>
+// CHECK:           return %[[VAL_1]] : memref<?x!llvm.struct<(i8)>>
+// CHECK:         }
+