From 4993e4e5d672312380d4e729bd3b96287620daab Mon Sep 17 00:00:00 2001 From: Victor Perez Date: Fri, 31 Mar 2023 18:01:06 +0100 Subject: [PATCH] [mlir][llvm] Drop `ResumeOp::verify()` function In patch https://reviews.llvm.org/rG478bd0735fc094d3af37e9791df5118a402ae7a7, this function was changed so that it always returns `success()`. Drop this and explicitly state it won't be generated in the `.td` file and explain `llvm.resume` restrictions will be checked in `LLVMFuncOp::verify()`. Differential Revision: https://reviews.llvm.org/D147342 --- mlir/include/mlir/Dialect/LLVMIR/LLVMOps.td | 3 ++- mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp | 11 ----------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/mlir/include/mlir/Dialect/LLVMIR/LLVMOps.td b/mlir/include/mlir/Dialect/LLVMIR/LLVMOps.td index 3abe161..f762b9c 100644 --- a/mlir/include/mlir/Dialect/LLVMIR/LLVMOps.td +++ b/mlir/include/mlir/Dialect/LLVMIR/LLVMOps.td @@ -894,7 +894,8 @@ def LLVM_ReturnOp : LLVM_TerminatorOp<"return", [Pure, ReturnLike]> { def LLVM_ResumeOp : LLVM_TerminatorOp<"resume"> { let arguments = (ins LLVM_Type:$value); let assemblyFormat = "$value attr-dict `:` type($value)"; - let hasVerifier = 1; + // Consistency of llvm.resume value types is checked in LLVMFuncOp::verify(). + let hasVerifier = false; string llvmInstName = "Resume"; string llvmBuilder = [{ builder.CreateResume($value); }]; string mlirBuilder = [{ diff --git a/mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp b/mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp index bfc574a..c593f84 100644 --- a/mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp +++ b/mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp @@ -1522,17 +1522,6 @@ LogicalResult ReturnOp::verify() { } //===----------------------------------------------------------------------===// -// ResumeOp -//===----------------------------------------------------------------------===// - -LogicalResult ResumeOp::verify() { - // Consistency of llvm.resume value types is checked in LLVMFuncOp::verify(). - - // No check for personality of function - landingpad op verifies it. - return success(); -} - -//===----------------------------------------------------------------------===// // Verifier for LLVM::AddressOfOp. //===----------------------------------------------------------------------===// -- 2.7.4