Addressed review comments.

Author: vzakhari

flang/lib/Optimizer/CodeGen/CodeGen.cpp

@@ -596,10 +596,7 @@ struct CallOpConversion : public fir::FIROpConversion<fir::CallOp> {
     auto fmi =
         mlir::cast<mlir::LLVM::FastmathFlagsInterface>(llvmCall.getOperation());
     if (!fmi.isFastmathApplicable())
-      llvmCall->setAttr(
-          mlir::LLVM::CallOp::getFastmathAttrName(),
-          mlir::LLVM::FastmathFlagsAttr::get(call.getContext(),
-                                             mlir::LLVM::FastmathFlags::none));
+      llvmCall.setFastmathFlags(mlir::LLVM::FastmathFlags::none);
     rewriter.replaceOp(call, llvmCall);
     return mlir::success();
   }

mlir/include/mlir/Dialect/Arith/IR/ArithOps.td

@@ -1211,9 +1211,6 @@ def Arith_ExtFOp : Arith_FToFCastOp<"extf", [DeclareOpInterfaceMethods<ArithFast
     The destination type must to be strictly wider than the source type.
     When operating on vectors, casts elementwise.
   }];
-  let extraClassDeclaration = [{
-    bool isApplicable() { return true; }
-  }];
   let hasVerifier = 1;
   let hasFolder = 1;
 

mlir/include/mlir/Dialect/Arith/IR/ArithOpsInterfaces.td

@@ -73,7 +73,10 @@ def ArithFastMathInterface : OpInterface<"ArithFastMathInterface"> {
     auto attr = fmi.getFastMathFlagsAttr();
     if (attr && attr.getValue() != ::mlir::arith::FastMathFlags::none &&
         !fmi.isArithFastMathApplicable())
-      return $_op->emitOpError() << "FastMathFlagsAttr is not applicable";
+      return $_op->emitOpError()
+          << "has flag(s) `" << stringifyEnum(attr.getValue())
+          << "`, but fast-math flags are not applicable "
+             "(`isArithFastMathApplicable()` returns false)";
     return ::mlir::success();
   }];
 }

mlir/include/mlir/Dialect/LLVMIR/LLVMInterfaces.td

@@ -73,7 +73,10 @@ def FastmathFlagsInterface : OpInterface<"FastmathFlagsInterface"> {
     auto attr = fmi.getFastmathAttr();
     if (attr && attr.getValue() != ::mlir::LLVM::FastmathFlags::none &&
         !fmi.isFastmathApplicable())
-      return $_op->emitOpError() << "FastmathFlagsAttr is not applicable";
+      return $_op->emitOpError()
+          << "has flag(s) `" << stringifyEnum(attr.getValue())
+          << "`, but fast-math flags are not applicable "
+             "(`isFastmathApplicable()` returns false)";
     return ::mlir::success();
   }];
 }

mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp

@@ -3798,7 +3798,7 @@ bool mlir::LLVM::FastmathFlagsInterface::isCompatibleType(Type type) {
   } else if (auto arrayType = dyn_cast<LLVMArrayType>(type)) {
     do {
       type = arrayType.getElementType();
-    } while (arrayType = dyn_cast<LLVMArrayType>(type));
+    } while ((arrayType = dyn_cast<LLVMArrayType>(type)));
   }
 
   if (isa<FloatType>(type))

mlir/test/Dialect/LLVMIR/invalid.mlir

@@ -1703,3 +1703,11 @@ llvm.func @wrong_number_of_bundle_tags() {
   } : (i32, i32) -> ()
   llvm.return
 }
+
+// -----
+
+func.func @call_invalid_fastmath(%callee : !llvm.ptr) {
+  // expected-error@+1 {{has flag(s) `nsz, afn`, but fast-math flags are not applicable (`isFastmathApplicable()` returns false)}}
+  llvm.call %callee() {fastmathFlags = #llvm.fastmath<nsz,afn>} : !llvm.ptr, () -> i32
+  llvm.return
+}