[Mlir-commits] [mlir] 95bd05d - [mlir][Func][NFC] Simplify implementation after #144706 (#145006)
llvmlistbot at llvm.org
llvmlistbot at llvm.org
Fri Jun 20 03:04:08 PDT 2025
Author: Matthias Springer
Date: 2025-06-20T12:04:04+02:00
New Revision: 95bd05d7cae327e431ccdaf0a452a0573ade5357
URL: https://github.com/llvm/llvm-project/commit/95bd05d7cae327e431ccdaf0a452a0573ade5357
DIFF: https://github.com/llvm/llvm-project/commit/95bd05d7cae327e431ccdaf0a452a0573ade5357.diff
LOG: [mlir][Func][NFC] Simplify implementation after #144706 (#145006)
Added:
Modified:
mlir/lib/Conversion/FuncToLLVM/FuncToLLVM.cpp
Removed:
################################################################################
diff --git a/mlir/lib/Conversion/FuncToLLVM/FuncToLLVM.cpp b/mlir/lib/Conversion/FuncToLLVM/FuncToLLVM.cpp
index c6bcb593eaad8..538016927256b 100644
--- a/mlir/lib/Conversion/FuncToLLVM/FuncToLLVM.cpp
+++ b/mlir/lib/Conversion/FuncToLLVM/FuncToLLVM.cpp
@@ -273,7 +273,7 @@ static void wrapExternalFunction(OpBuilder &builder, Location loc,
static void restoreByValRefArgumentType(
ConversionPatternRewriter &rewriter, const LLVMTypeConverter &typeConverter,
ArrayRef<std::optional<NamedAttribute>> byValRefNonPtrAttrs,
- ArrayRef<BlockArgument> oldBlockArgs, LLVM::LLVMFuncOp funcOp) {
+ LLVM::LLVMFuncOp funcOp) {
// Nothing to do for function declarations.
if (funcOp.isExternal())
return;
@@ -281,8 +281,8 @@ static void restoreByValRefArgumentType(
ConversionPatternRewriter::InsertionGuard guard(rewriter);
rewriter.setInsertionPointToStart(&funcOp.getFunctionBody().front());
- for (const auto &[arg, oldArg, byValRefAttr] :
- llvm::zip(funcOp.getArguments(), oldBlockArgs, byValRefNonPtrAttrs)) {
+ for (const auto &[arg, byValRefAttr] :
+ llvm::zip(funcOp.getArguments(), byValRefNonPtrAttrs)) {
// Skip argument if no `llvm.byval` or `llvm.byref` attribute.
if (!byValRefAttr)
continue;
@@ -309,10 +309,6 @@ mlir::convertFuncOpToLLVMFuncOp(FunctionOpInterface funcOp,
return rewriter.notifyMatchFailure(
funcOp, "Only support FunctionOpInterface with FunctionType");
- // Keep track of the entry block arguments. They will be needed later.
- SmallVector<BlockArgument> oldBlockArgs =
- llvm::to_vector(funcOp.getArguments());
-
// Convert the original function arguments. They are converted using the
// LLVMTypeConverter provided to this legalization pattern.
auto varargsAttr = funcOp->getAttrOfType<BoolAttr>(varargsAttrName);
@@ -455,7 +451,7 @@ mlir::convertFuncOpToLLVMFuncOp(FunctionOpInterface funcOp,
// pointee type in the function body when converting `llvm.byval`/`llvm.byref`
// function arguments.
restoreByValRefArgumentType(rewriter, converter, byValRefNonPtrAttrs,
- oldBlockArgs, newFuncOp);
+ newFuncOp);
if (!shouldUseBarePtrCallConv(funcOp, &converter)) {
if (funcOp->getAttrOfType<UnitAttr>(
More information about the Mlir-commits
mailing list