Add support for if and while statements that declare a condition variable. (#271)

Author: gysit

tools/cgeist/Lib/CGStmt.cc

@@ -758,10 +758,10 @@ ValueCategory MLIRScanner::VisitDoStmt(clang::DoStmt *fors) {
   return nullptr;
 }
 
-ValueCategory MLIRScanner::VisitWhileStmt(clang::WhileStmt *fors) {
+ValueCategory MLIRScanner::VisitWhileStmt(clang::WhileStmt *stmt) {
   IfScope scope(*this);
 
-  auto loc = getMLIRLocation(fors->getLParenLoc());
+  auto loc = getMLIRLocation(stmt->getLParenLoc());
 
   auto i1Ty = builder.getIntegerType(1);
   auto type = mlir::MemRefType::get({}, i1Ty, {}, 0);
@@ -782,7 +782,9 @@ ValueCategory MLIRScanner::VisitWhileStmt(clang::WhileStmt *fors) {
 
   builder.setInsertionPointToStart(&condB);
 
-  if (auto *s = fors->getCond()) {
+  if (auto declStmt = stmt->getConditionVariableDeclStmt())
+    Visit(declStmt);
+  if (auto *s = stmt->getCond()) {
     auto condRes = Visit(s);
     auto cond = condRes.getValue(loc, builder);
     if (auto LT = cond.getType().dyn_cast<mlir::LLVM::LLVMPointerType>()) {
@@ -809,7 +811,7 @@ ValueCategory MLIRScanner::VisitWhileStmt(clang::WhileStmt *fors) {
                                            std::vector<mlir::Value>()),
       loops.back().keepRunning, std::vector<mlir::Value>());
 
-  Visit(fors->getBody());
+  Visit(stmt->getBody());
   loops.pop_back();
 
   builder.create<mlir::cf::BranchOp>(loc, &condB);
@@ -822,6 +824,8 @@ ValueCategory MLIRScanner::VisitWhileStmt(clang::WhileStmt *fors) {
 ValueCategory MLIRScanner::VisitIfStmt(clang::IfStmt *stmt) {
   IfScope scope(*this);
   auto loc = getMLIRLocation(stmt->getIfLoc());
+  if (auto declStmt = stmt->getConditionVariableDeclStmt())
+    Visit(declStmt);
   auto cond = Visit(stmt->getCond()).getValue(loc, builder);
   assert(cond != nullptr && "must be a non-null");
 

tools/cgeist/Test/Verification/if_decl.cpp

@@ -0,0 +1,21 @@
+// RUN: cgeist %s --function=* -S | FileCheck %s
+
+struct A {
+  int value;  
+
+  int* getPointer() {
+    if (int* tmp = &this->value) { 
+      return tmp; 
+    }  
+    return nullptr;  
+  }
+};
+
+int main() {
+  return *A().getPointer();
+}
+
+// CHECK:   func.func @_ZN1A10getPointerEv(
+// CHECK:   "polygeist.memref2pointer"
+// CHECK:   llvm.mlir.null
+// CHECK:   llvm.icmp "ne"

tools/cgeist/Test/Verification/while_decl.cpp

@@ -0,0 +1,21 @@
+// RUN: cgeist %s --function=* -S | FileCheck %s
+
+struct A {
+  int value;  
+
+  int getValue() {
+    while (int tmp = this->value) { 
+      tmp++;
+    }  
+    return value;  
+  }
+};
+
+int main() {
+  return A().getValue();
+}
+
+// CHECK:   func.func @_ZN1A8getValueEv(
+// CHECK:   scf.while
+// CHECK:   arith.cmpi ne
+// CHECK:   scf.condition