diff --git a/mlir/lib/Dialect/Linalg/Transforms/Padding.cpp b/mlir/lib/Dialect/Linalg/Transforms/Padding.cpp --- a/mlir/lib/Dialect/Linalg/Transforms/Padding.cpp +++ b/mlir/lib/Dialect/Linalg/Transforms/Padding.cpp @@ -99,9 +99,10 @@ static FailureOr padOperandToSmallestStaticBoundingBox( RewriterBase &rewriter, linalg::LinalgOp opToPad, OpOperand *opOperand, const LinalgPaddingOptions &options) { - assert(!options.padToMultipleOf.has_value() || - options.padToMultipleOf->size() == options.paddingDimensions.size() && - "invalid number of elements in padToMultipleOf"); + assert( + (!options.padToMultipleOf.has_value() || + options.padToMultipleOf->size() == options.paddingDimensions.size()) && + "invalid number of elements in padToMultipleOf"); // Compute padded shape. SmallVector paddedShape; diff --git a/mlir/lib/Dialect/NVGPU/TransformOps/NVGPUTransformOps.cpp b/mlir/lib/Dialect/NVGPU/TransformOps/NVGPUTransformOps.cpp --- a/mlir/lib/Dialect/NVGPU/TransformOps/NVGPUTransformOps.cpp +++ b/mlir/lib/Dialect/NVGPU/TransformOps/NVGPUTransformOps.cpp @@ -438,7 +438,7 @@ transform::TransformState &state) { bool fail = true; // TODO: more robust detection of matmulOp, with transposes etc. - if (auto matmulOp = isa(linalgOp.getOperation())) { + if (isa_and_nonnull(linalgOp.getOperation())) { Location loc = linalgOp.getLoc(); // TODO: more robust computation of laneId, for now assume a single warp. Value laneId = rewriter.create( diff --git a/mlir/lib/Dialect/Transform/IR/TransformInterfaces.cpp b/mlir/lib/Dialect/Transform/IR/TransformInterfaces.cpp --- a/mlir/lib/Dialect/Transform/IR/TransformInterfaces.cpp +++ b/mlir/lib/Dialect/Transform/IR/TransformInterfaces.cpp @@ -521,7 +521,9 @@ for (Operation *ancestor : potentialAncestors) { Operation *definingOp; std::optional resultNo; - unsigned argumentNo, blockNo, regionNo; + unsigned argumentNo = std::numeric_limits::max(); + unsigned blockNo = std::numeric_limits::max(); + unsigned regionNo = std::numeric_limits::max(); if (auto opResult = llvm::dyn_cast(payloadValue)) { definingOp = opResult.getOwner(); resultNo = opResult.getResultNumber(); diff --git a/mlir/test/lib/Dialect/Tensor/TestTensorTransforms.cpp b/mlir/test/lib/Dialect/Tensor/TestTensorTransforms.cpp --- a/mlir/test/lib/Dialect/Tensor/TestTensorTransforms.cpp +++ b/mlir/test/lib/Dialect/Tensor/TestTensorTransforms.cpp @@ -317,7 +317,7 @@ if (status.wasInterrupted()) return failure(); if (!replaced) { - replaced->emitError("could not find 'replaced' op"); + rootOp->emitError("could not find 'replaced' op"); return failure(); }