Apply review feedback

Author: Andres-Salamanca

clang/include/clang/CIR/Dialect/IR/CIROps.td

@@ -2344,7 +2344,7 @@ def CIR_FuncOp : CIR_Op<"func", [
     A compiler builtin function must be marked as `builtin` for further
     processing when lowering from CIR.
 
-    The `coroutine` keyword is used to mark coroutine function, which requires
+    The `coroutine` keyword is used to mark a coroutine function, which requires
     at least one `cir.await` instruction to be used in its body.
 
     The `lambda` translates to a C++ `operator()` that implements a lambda, this

clang/lib/CIR/CodeGen/CIRGenBuiltin.cpp

@@ -439,7 +439,7 @@ RValue CIRGenFunction::emitBuiltinExpr(const GlobalDecl &gd, unsigned builtinID,
   case Builtin::BI__builtin_coro_end:
   case Builtin::BI__builtin_coro_suspend:
   case Builtin::BI__builtin_coro_align:
-    llvm_unreachable("BI__builtin_coro_id like NYI");
+    llvm_unreachable("Error NYI");
 
   case Builtin::BI__builtin_coro_frame: {
     cgm.errorNYI(e->getSourceRange(), "BI__builtin_coro_frame NYI");

clang/lib/CIR/CodeGen/CIRGenCoroutine.cpp

@@ -32,12 +32,9 @@ CIRGenFunction::CGCoroInfo::~CGCoroInfo() {}
 static void createCoroData(CIRGenFunction &cgf,
                            CIRGenFunction::CGCoroInfo &curCoro,
                            cir::CallOp coroId) {
-  if (curCoro.data) {
-    llvm_unreachable("EmitCoroutineBodyStatement called twice?");
-    return;
-  }
+  assert(!curCoro.data && "EmitCoroutineBodyStatement called twice?");
 
-  curCoro.data = std::unique_ptr<CGCoroData>(new CGCoroData);
+  curCoro.data = std::make_unique<CGCoroData>();
   curCoro.data->coroId = coroId;
 }
 
@@ -57,8 +54,9 @@ cir::CallOp CIRGenFunction::emitCoroIDBuiltinCall(mlir::Location loc,
         cir::FuncType::get({int32Ty, VoidPtrTy, VoidPtrTy, VoidPtrTy}, int32Ty),
         /*FD=*/nullptr);
     assert(fnOp && "should always succeed");
-  } else
+  } else {
     fnOp = cast<cir::FuncOp>(builtin);
+  }
 
   return builder.createCallOp(loc, fnOp,
                               mlir::ValueRange{builder.getUInt32(newAlign, loc),
@@ -70,8 +68,7 @@ CIRGenFunction::emitCoroutineBody(const CoroutineBodyStmt &s) {
   mlir::Location openCurlyLoc = getLoc(s.getBeginLoc());
   cir::ConstantOp nullPtrCst = builder.getNullPtr(VoidPtrTy, openCurlyLoc);
 
-  auto fn = dyn_cast<cir::FuncOp>(curFn);
-  assert(fn && "other callables are NYI");
+  auto fn = mlir::cast<cir::FuncOp>(curFn);
   fn.setCoroutine(true);
   cir::CallOp coroId = emitCoroIDBuiltinCall(openCurlyLoc, nullPtrCst);
   createCoroData(*this, curCoro, coroId);

clang/test/CIR/IR/func.cir

@@ -99,4 +99,15 @@ cir.func @ullfunc() -> !u64i {
 // CHECK:   %[[VAL:.*]] = cir.const #cir.int<42> : !u64i
 // CHECK:   cir.return %[[VAL:.*]] : !u64i
 // CHECK: }
+
+cir.func coroutine @coro() {
+  cir.return
+}
+// CHECK: cir.func{{.*}} coroutine @coro()
+
+cir.func builtin @builtin() {
+  cir.return
+}
+// CHECK: cir.func{{.*}} builtin @builtin()
+
 }