class emitted with failing test

Author: Jaddyen

mlir/lib/Target/Cpp/TranslateToCpp.cpp

@@ -1004,13 +1004,17 @@ static LogicalResult printOperation(CppEmitter &emitter, ClassOp classOp) {
   os << "public:\n";
 
   os.indent();
+<<<<<<< Updated upstream
   for (Operation &op : classOp) {
     if (isa<FieldOp>(op)) {
       if (failed(emitter.emitOperation(op, /*trailingSemicolon=*/true)))
         return failure();
     }
   }
   os << "\nconst std::map<std::string, char*> _buffer_map {\n";
+=======
+  os << "const std::map<std::string, char*> _buffer_map {\n";
+>>>>>>> Stashed changes
   for (Operation &op : classOp) {
     if (auto fieldOp = dyn_cast<FieldOp>(op)) {
       os << "  { \"" << fieldOp.getSymName() << "\", reinterpret_cast<char*>(&"
@@ -1022,12 +1026,19 @@ static LogicalResult printOperation(CppEmitter &emitter, ClassOp classOp) {
   os << "char* getBufferForName(const std::string& name) const {\n";
   os << "  auto it = _buffer_map.find(name);\n";
   os << "  return (it == _buffer_map.end()) ? nullptr : it->second;\n";
+<<<<<<< Updated upstream
   os << "}\n\n";
   for (Operation &op : classOp) {
     if (!isa<FieldOp>(op)) {
       if (failed(emitter.emitOperation(op, /*trailingSemicolon=*/false)))
         return failure();
     }
+=======
+  os << "}\n";
+  for (Operation &op : classOp) {
+    if (failed(emitter.emitOperation(op, /*trailingSemicolon=*/false)))
+      return failure();
+>>>>>>> Stashed changes
   }
 
   os.unindent();
@@ -1037,11 +1048,17 @@ static LogicalResult printOperation(CppEmitter &emitter, ClassOp classOp) {
 
 static LogicalResult printOperation(CppEmitter &emitter, FieldOp fieldOp) {
   raw_ostream &os = emitter.ostream();
+<<<<<<< Updated upstream
   Location loc = fieldOp->getLoc();
   Type type = fieldOp.getType();
   if (failed(emitter.emitType(loc, type)))
     return failure();
   os << " " << fieldOp.getSymName();
+=======
+  if (failed(emitter.emitType(fieldOp->getLoc(), fieldOp.getType())))
+    return failure();
+  os << " " << fieldOp.getSymName() << ";";
+>>>>>>> Stashed changes
   return success();
 }
 

mlir/test/mlir-translate/emit_classops.mlir

@@ -0,0 +1,29 @@
+// RUN: mlir-translate --mlir-to-cpp %s | FileCheck %s
+
+emitc.class @modelClass {
+    emitc.field @input_tensor : !emitc.array<1xf32> 
+    emitc.func @execute() {
+        %0 = "emitc.constant"() <{value = 0 : index}> : () -> !emitc.size_t
+        %1 = get_field @input_tensor : !emitc.array<1xf32>
+        %2 = subscript %1[%0] : (!emitc.array<1xf32>, !emitc.size_t) -> !emitc.lvalue<f32>
+        return
+    }
+}
+
+// CHECK: class modelClass final {
+// CHECK-NEXT: public:
+// CHECK-NEXT:const std::map<std::string, char*> buffer_map {
+// CHECK-NEXT:    { "input_tensor", reinterpret_cast<char*>(&input_tensor) },
+// CHECK-NEXT:  };
+// CHECK-NEXT:  char* getBufferForName(const std::string& name) const {
+// CHECK-NEXT:    auto it = buffer_map.find(name);
+// CHECK-NEXT:    return (it == buffer_map.end()) ? nullptr : it->second;
+// CHECK-NEXT:  }
+// CHECK-NEXT:  float input_tensor[1];
+// CHECK-NEXT:  void execute() {
+// CHECK-NEXT:    size_t v1 = 0;
+// CHECK-NEXT:    float v2[1] = input_tensor;
+// CHECK-NEXT:    return;
+// CHECK-NEXT:  }
+// CHECK-EMPTY:
+// CHECK-NEXT: };