[ParseResult] Fix warning in flang build, incorporate feedback from River.

[lattner]

Summary

The warning caused build errors on a couple flang testers that are
building with -Werror. The diagnostic change makes the generated
error correct.

This is a followup to https://reviews.llvm.org/D125549

[bondhugula]

mlir/lib/Parser/AffineParser.cpp

521

Thanks for fixing this and the other cleanup in the previous patch!

[rriddle]

Sweet, thanks!

flang/lib/Optimizer/Dialect/FIROps.cpp

mlir::ParseResult fir::CoordinateOp::parse(mlir::OpAsmParser &parser,
   llvm::SmallVector<mlir::OpAsmParser::UnresolvedOperand> allOperands;
   allOperands.push_back(memref);
   allOperands.append(coorOperands.begin(), coorOperands.end());
   mlir::FunctionType funcTy;
   auto loc = parser.getCurrentLocation();
   if (parser.parseOptionalAttrDict(result.attributes) ||
       parser.parseColonType(funcTy) ||
       parser.resolveOperands(allOperands, funcTy.getInputs(), loc,
-                             result.operands))
+                             result.operands) ||
+      parser.addTypesToList(funcTy.getResults(), result.types))
     return mlir::failure();
-  parser.addTypesToList(funcTy.getResults(), result.types);
   result.addAttribute("baseType", mlir::TypeAttr::get(funcTy.getInput(0)));
   return mlir::success();
 }
 
 mlir::LogicalResult fir::CoordinateOp::verify() {
   auto refTy = getRef().getType();
   if (fir::isa_ref_type(refTy)) {
     auto eleTy = fir::dyn_cast_ptrEleTy(refTy);

mlir/lib/Dialect/SPIRV/IR/SPIRVOps.cpp

if (vceTriple)
     state.addAttribute(getVCETripleAttrName(), *vceTriple);
   if (name)
     state.addAttribute(mlir::SymbolTable::getSymbolAttrName(),
                        builder.getStringAttr(*name));
 }
 
 ParseResult spirv::ModuleOp::parse(OpAsmParser &parser, OperationState &state) {
   Region *body = state.addRegion();
-  StringAttr nameAttr;
-  spirv::AddressingModel addrModel;
-  spirv::MemoryModel memoryModel;
 
   // If the name is present, parse it.
+  StringAttr nameAttr;
   (void)parser.parseOptionalSymbolName(
       nameAttr, mlir::SymbolTable::getSymbolAttrName(), state.attributes);
 
   // Parse attributes
+  spirv::AddressingModel addrModel;
+  spirv::MemoryModel memoryModel;
   if (::parseEnumKeywordAttr(addrModel, parser, state) ||
       ::parseEnumKeywordAttr(memoryModel, parser, state))
     return failure();
 
   if (succeeded(parser.parseOptionalKeyword("requires"))) {
     spirv::VerCapExtAttr vceTriple;
     if (parser.parseAttribute(vceTriple,
                               spirv::ModuleOp::getVCETripleAttrName(),

mlir/lib/Parser/AffineParser.cpp

ParseResult AffineParser::parseAffineMapOrIntegerSetInline(AffineMap &map,
 
   // List of dimensional and optional symbol identifiers.
   if (parseDimAndOptionalSymbolIdList(numDims, numSymbols))
     return failure();
 
   if (consumeIf(Token::arrow))
     return parseAffineMapRange(numDims, numSymbols, map);
 
-  if (parseToken(Token::colon, "expected '->' or '['"))
+  if (parseToken(Token::colon, "expected '->' or ':'"))
     return failure();
   return parseIntegerSetConstraints(numDims, numSymbols, set);
 }
 
 /// Parse an AffineMap where the dim and symbol identifiers are SSA ids.
 ParseResult
 AffineParser::parseAffineMapOfSSAIds(AffineMap &map,
                                      OpAsmParser::Delimiter delimiter) {

mlir/test/IR/invalid.mlir

 func.func @invalid_tensor_literal() {
   // expected-error @+1 {{sparse index #0 is not contained within the value shape, with index=[1, 1], and type='tensor<1x1xi16>'}}
   "fooi16"(){bar = sparse<1, 10> : tensor<1x1xi16>} : () -> ()
 
 // -----
 
 func.func @invalid_affine_structure() {
   %c0 = arith.constant 0 : index
-  %idx = affine.apply affine_map<(d0, d1)> (%c0, %c0) // expected-error {{expected '->' or '['}}
+  %idx = affine.apply affine_map<(d0, d1)> (%c0, %c0) // expected-error {{expected '->' or ':'}}
   return
 }
 
 // -----
 
 func.func @missing_for_max(%arg0: index, %arg1: index, %arg2: memref<100xf32>) {
   // expected-error @+1 {{lower loop bound affine map with multiple results requires 'max' prefix}}
   affine.for %i0 = affine_map<()[s]->(0,s-1)>()[%arg0] to %arg1 {