remove argIdx arg + style nits

Author: jeanPerier

mlir/include/mlir/Target/LLVMIR/ModuleTranslation.h

@@ -230,7 +230,7 @@ class ModuleTranslation {
 
   /// Translates parameter attributes of a call and adds them to the returned
   /// AttrBuilder. Returns failure if any of the translations failed.
-  FailureOr<llvm::AttrBuilder> convertParameterAttrs(CallOp callOp, int argIdx,
+  FailureOr<llvm::AttrBuilder> convertParameterAttrs(CallOp callOp,
                                                      DictionaryAttr paramAttrs);
 
   /// Gets the named metadata in the LLVM IR module being constructed, creating

mlir/lib/Target/LLVMIR/Dialect/LLVMIR/LLVMToLLVMIRTranslation.cpp

@@ -265,26 +265,28 @@ convertOperationImpl(Operation &opInst, llvm::IRBuilderBase &builder,
     if (callOp.getWillReturnAttr())
       call->addFnAttr(llvm::Attribute::WillReturn);
 
-    if (ArrayAttr argAttrsArray = callOp.getArgAttrsAttr())
+    if (ArrayAttr argAttrsArray = callOp.getArgAttrsAttr()) {
       for (auto [argIdx, argAttrsAttr] : llvm::enumerate(argAttrsArray)) {
         if (auto argAttrs = llvm::cast<DictionaryAttr>(argAttrsAttr)) {
           FailureOr<llvm::AttrBuilder> attrBuilder =
-              moduleTranslation.convertParameterAttrs(callOp, argIdx, argAttrs);
+              moduleTranslation.convertParameterAttrs(callOp, argAttrs);
           if (failed(attrBuilder))
             return failure();
           call->addParamAttrs(argIdx, *attrBuilder);
         }
       }
+    }
 
     ArrayAttr resAttrsArray = callOp.getResAttrsAttr();
-    if (resAttrsArray && resAttrsArray.size() == 1)
+    if (resAttrsArray && resAttrsArray.size() == 1) {
       if (auto resAttrs = llvm::cast<DictionaryAttr>(resAttrsArray[0])) {
         FailureOr<llvm::AttrBuilder> attrBuilder =
-            moduleTranslation.convertParameterAttrs(callOp, -1, resAttrs);
+            moduleTranslation.convertParameterAttrs(callOp, resAttrs);
         if (failed(attrBuilder))
           return failure();
         call->addRetAttrs(*attrBuilder);
       }
+    }
 
     if (MemoryEffectsAttr memAttr = callOp.getMemoryEffectsAttr()) {
       llvm::MemoryEffects memEffects =

mlir/lib/Target/LLVMIR/ModuleTranslation.cpp

@@ -1604,8 +1604,7 @@ ModuleTranslation::convertParameterAttrs(LLVMFuncOp func, int argIdx,
 }
 
 FailureOr<llvm::AttrBuilder>
-ModuleTranslation::convertParameterAttrs(CallOp, int argIdx,
-                                         DictionaryAttr paramAttrs) {
+ModuleTranslation::convertParameterAttrs(CallOp, DictionaryAttr paramAttrs) {
   llvm::AttrBuilder attrBuilder(llvmModule->getContext());
   auto attrNameToKindMapping = getAttrNameToKindMapping();
 

mlir/test/Target/LLVMIR/call-argument-attributes.mlir

@@ -9,7 +9,7 @@ llvm.func @test_call_arg_attrs_direct(%arg0: i32, %arg1: !llvm.ptr) {
   llvm.return
 }
 
-// CHECK-LABEL: define i16 @test_call_arg_attrs_indirec
+// CHECK-LABEL: define i16 @test_call_arg_attrs_indirect
 llvm.func @test_call_arg_attrs_indirect(%arg0: i16, %arg1: !llvm.ptr) -> i16 {
   // CHECK: tail call signext i16 %{{.*}}(i16 noundef signext %{{.*}})
   %0 = llvm.call tail %arg1(%arg0) : !llvm.ptr, (i16 {llvm.noundef, llvm.signext}) -> (i16 {llvm.signext})