Apply review suggestions

Co-authored-by: Andy Kaylor <[email protected]>

Author: el-ev

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

@@ -2251,8 +2251,8 @@ def CIR_InlineAsmOp : CIR_Op<"asm", [RecursiveMemoryEffects]> {
   let description = [{
     The `cir.asm` operation represents C/C++ asm inline.
 
-    CIR constraints strings follow barely the same rules that are established
-    for the C level assembler constraints with several differences caused by
+    CIR constraints strings follow the same rules that are established for
+    the C level assembler constraints with several differences caused by
     clang::AsmStmt processing.
 
     Thus, numbers that appears in the constraint string may also refer to:
@@ -2262,11 +2262,9 @@ def CIR_InlineAsmOp : CIR_Op<"asm", [RecursiveMemoryEffects]> {
     Operand attributes are a storage, where each element corresponds to the
     operand with the same index. The first index relates to the operation
     result (if any).
-    Note, the operands themselves are stored as VariadicOfVariadic in the next
-    order: output, input and then in/out operands.
-
-    Note, when several output operands are present, the result type may be
-    represented as an anon record type.
+    The operands themselves are stored as VariadicOfVariadic in the following
+    order: output, input and then in/out operands. When several output operands
+    are present, the result type may be represented as an anonymous record type.
 
     Example:
     ```C++

clang/lib/CIR/Dialect/IR/CIRDialect.cpp

@@ -2419,7 +2419,7 @@ void cir::InlineAsmOp::print(OpAsmPrinter &p) {
   auto *nameIt = names.begin();
   auto *attrIt = getOperandAttrs().begin();
 
-  for (auto ops : getAsmOperands()) {
+  for (mlir::OperandRange ops : getAsmOperands()) {
     p << *nameIt << " = ";
 
     p << '[';
@@ -2491,7 +2491,7 @@ ParseResult cir::InlineAsmOp::parse(OpAsmParser &parser,
   llvm::SmallVector<int32_t> operandsGroupSizes;
   std::string asmString, constraints;
   Type resType;
-  auto *ctxt = parser.getBuilder().getContext();
+  MLIRContext *ctxt = parser.getBuilder().getContext();
 
   auto error = [&](const Twine &msg) -> LogicalResult {
     return parser.emitError(parser.getCurrentLocation(), msg);
@@ -2515,7 +2515,7 @@ ParseResult cir::InlineAsmOp::parse(OpAsmParser &parser,
     OpAsmParser::UnresolvedOperand op;
 
     if (parser.parseOperand(op) || parser.parseColon())
-      return mlir::failure();
+      return error("can't parse operand");
 
     Type typ;
     if (parser.parseType(typ).failed())
@@ -2543,26 +2543,30 @@ ParseResult cir::InlineAsmOp::parse(OpAsmParser &parser,
       return mlir::success();
     }
 
-    if (parser.parseCommaSeparatedList([&]() {
-          Value val;
-          if (parseValue(val).succeeded()) {
-            result.operands.push_back(val);
-            size++;
-
-            if (parser.parseOptionalLParen().failed()) {
-              operandAttrs.push_back(mlir::Attribute());
-              return mlir::success();
-            }
-
-            if (parser.parseKeyword("maybe_memory").succeeded()) {
-              operandAttrs.push_back(mlir::UnitAttr::get(ctxt));
-              if (parser.parseRParen())
-                return expected(")");
-              return mlir::success();
-            }
-          }
-          return mlir::failure();
-        }))
+    auto parseOperand = [&]() {
+      Value val;
+      if (parseValue(val).succeeded()) {
+        result.operands.push_back(val);
+        size++;
+
+        if (parser.parseOptionalLParen().failed()) {
+          operandAttrs.push_back(mlir::Attribute());
+          return mlir::success();
+        }
+
+        if (parser.parseKeyword("maybe_memory").succeeded()) {
+          operandAttrs.push_back(mlir::UnitAttr::get(ctxt));
+          if (parser.parseRParen())
+            return expected(")");
+          return mlir::success();
+        } else {
+          return expected("maybe_memory");
+        }
+      }
+      return mlir::failure();
+    };
+
+    if (parser.parseCommaSeparatedList(parseOperand).failed())
       return mlir::failure();
 
     if (parser.parseRSquare().failed() || parser.parseComma().failed())